overleaf/services/web/app/coffee/Features/User
Henry Oswald 9c6f0faff6 Merge branch 'i18n'
Conflicts:
	app/coffee/Features/User/UserPagesController.coffee
	app/views/layout.jade
	app/views/project/editor/dropbox.jade
	app/views/project/editor/file-tree.jade
	app/views/project/editor/pdf.jade
	app/views/project/list/project-list.jade
	app/views/user/settings.jade
2014-08-07 14:46:17 +01:00
..
UserController.coffee
UserCreator.coffee
UserDeleter.coffee
UserGetter.coffee
UserInfoController.coffee
UserLocator.coffee
UserPagesController.coffee Merge branch 'i18n' 2014-08-07 14:46:17 +01:00
UserRegistrationHandler.coffee
UserUpdater.coffee