Sacha Greif 35f224cdd2 Merge branch 'nova' into devel ... # Conflicts: # README.md # packages/telescope-notifications/lib/notifications.js		2016-04-15 09:33:46 +09:00
..
templates	Merge branch 'nova' into devel	2016-04-15 09:33:46 +09:00
invites.js	Merge branch 'nova' into devel	2016-04-15 09:33:46 +09:00
publications.js	clean up	2016-02-23 16:59:15 +09:00
routes.js	clean up	2016-02-23 16:59:15 +09:00
templates.js	switching Email back to global Telescope.email for now; getting rid of Herald; improving user edit form;	2016-04-01 12:38:50 +09:00