Shane Kilkelly 1b29e0e8ec Merge branch 'master' of github.com:sharelatex/web-sharelatex ... # Conflicts: # app/coffee/Features/Notifications/NotificationsBuilder.coffee		2016-08-31 09:48:19 +01:00
..
coffee	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-08-31 09:48:19 +01:00
templates/project_files
views	Merge pull request #306 from sharelatex/compile-check	2016-08-30 11:58:04 +01:00