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
..
.finished-upgraders	updating to Meteor 1.0	2014-11-17 09:35:29 +09:00
.gitignore	Add meteorite to .gitignore	2012-09-24 19:45:22 +02:00
.id	working on daily view	2014-08-27 10:23:56 +09:00
cordova-plugins	fix comment publication bug	2014-09-19 20:00:22 +09:00
packages	Merge branch 'master' into quickform	2014-11-26 11:22:54 +09:00
platforms	updating to Meteor 1.0	2014-11-17 09:35:29 +09:00
release	updating to Meteor 1.0	2014-11-17 09:35:29 +09:00
versions	Merge branch 'master' of https://github.com/TelescopeJS/Telescope	2014-11-25 15:47:49 +09:00