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
..
client/templates	clean up	2016-02-23 16:59:15 +09:00
server	Merge branch 'nova' into devel	2016-04-15 09:33:46 +09:00
invites.js	using smart publications and smart methods	2016-02-28 13:12:36 +09:00