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
..
binary-file.less
chat.less	Use string split instead of regex.	2016-08-02 11:59:43 +01:00
enago.less
file-tree.less
hotkeys.less
left-menu.less
online-users.less
pdf.less
publish-template.less
search.less
share.less	Start integrating invites into share frontend	2016-07-25 14:27:02 +01:00
toolbar.less
track-changes.less	UI fix - do not allow multiple clicks to restore a deleted file.	2016-08-03 16:05:19 +01:00