Vulcan/packages/telescope-api
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
..
lib/server updating packages for IR 1.0 2014-11-17 14:53:42 +09:00
.gitignore adding rss and api packages 2014-06-27 19:57:30 +09:00
package.js Fixed rss package 2014-08-28 13:39:30 +09:00
versions.json Merge branch 'master' into quickform 2014-11-26 11:22:54 +09:00