Sacha Greif ffdbaed70d Merge branch 'settings-package' of https://github.com/delgermurun/Telescope into delgermurun-settings-package ... Conflicts: .meteor/packages .meteor/versions client/components/postList/posts_list.js client/main.js lib/router/filters.js lib/router/posts.js lib/router/users.js packages/telescope-base/package.js packages/telescope-daily/lib/routes.js packages/telescope-module-share/package.js packages/telescope-seo/lib/routes.js packages/telescope-seo/lib/seo.js packages/telescope-seo/package.js packages/telescope-singleday/lib/routes.js		2015-04-08 09:20:50 +09:00
..
.finished-upgraders	updating Meteor	2015-03-26 12:00:15 +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 'settings-package' of https://github.com/delgermurun/Telescope into delgermurun-settings-package	2015-04-08 09:20:50 +09:00
platforms	updating to Meteor 1.0	2014-11-17 09:35:29 +09:00
release	updating to 1.1	2015-04-02 18:49:52 +09:00
versions	Merge branch 'settings-package' of https://github.com/delgermurun/Telescope into delgermurun-settings-package	2015-04-08 09:20:50 +09:00