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

..

editor

Merge branch 'master' into pr-email-tokens

2016-08-15 10:29:21 +01:00

invite

Small wording changes

2016-08-03 14:06:08 +01:00

list

Make notification column layout explicit.

2016-08-05 16:41:11 +01:00

editor.jade

add comment not to fingerprint worker

2016-07-22 09:05:39 +01:00

list.jade

slighly change layout of notifications & insert html via angular

2016-02-04 12:11:45 +00:00