Sacha Greif 48bfb14b11 Merge branch 'devel' of https://github.com/TelescopeJS/Telescope into devel ... Conflicts: .meteor/versions		2015-04-03 09:49:04 +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	Bring SEO features back into core and refactor SEO package into sitemap package	2015-04-01 11:00:31 +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 'devel' of https://github.com/TelescopeJS/Telescope into devel	2015-04-03 09:49:04 +09:00