overleaf/services/web/public/coffee/ide/share/controllers
Shane Kilkelly 158afbb157 Merge branch 'master' into pr-email-tokens
Conflicts:
	app/coffee/Features/Notifications/NotificationsBuilder.coffee
	public/coffee/ide/share/controllers/ShareController.coffee
2016-08-15 10:29:21 +01:00
..
ShareController.coffee Merge branch 'master' into pr-email-tokens 2016-08-15 10:29:21 +01:00
ShareProjectModalController.coffee Blur the resend button after response 2016-08-12 11:25:03 +01:00