Sacha Greif b7ba4b3bc0 Merge branch 'post-by-rss' of https://github.com/delgermurun/Telescope into delgermurun-post-by-rss ... Conflicts: .meteor/packages		2014-12-18 10:37:49 +09:00
..
client/templates	Merge branch 'telescope-master-semantic-messages' of https://github.com/AdmitHub/Telescope into AdmitHub-telescope-master-semantic-messages	2014-12-06 17:34:08 +09:00
server	Merge branch 'post-by-rss' of https://github.com/delgermurun/Telescope into delgermurun-post-by-rss	2014-12-18 10:37:49 +09:00
newsletter.js	adding userCreatedCallbacks callback hook and refactoring user creation	2014-12-13 14:02:45 +09:00