Sacha Greif b8dc56ea40 Merge branch 'master' into quickform ... Conflicts: .meteor/versions client/views/settings/quickFormSettings.html collections/posts.js lib/router.js packages/telescope-api/versions.json packages/telescope-base/versions.json packages/telescope-module-embedly/versions.json packages/telescope-module-share/versions.json packages/telescope-notifications/versions.json packages/telescope-rss/versions.json packages/telescope-theme-base/versions.json packages/telescope-theme-hubble/versions.json		2014-11-26 11:22:54 +09:00
..
client/templates	internationalizing packages	2014-11-24 11:27:07 +09:00
server	refactor server-side email template routes	2014-11-19 15:14:54 +09:00
newsletter.js	Using omit: true	2014-10-06 10:40:45 +09:00