mirror of
https://github.com/overleaf/overleaf.git
synced 2024-12-11 17:56:55 -05:00
9c6f0faff6
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 |
||
---|---|---|
.. | ||
login.jade | ||
passwordReset.jade | ||
register.jade | ||
restricted.jade | ||
setPassword.jade | ||
settings.jade |