Vulcan/packages/telescope-daily
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
..
i18n use zh-CN as code for Chinese 2014-11-24 11:38:57 +09:00
lib renaming i18n helper from "i18n" to "_" 2014-11-25 17:16:00 +09:00
.gitignore working on daily view 2014-08-27 10:23:56 +09:00
package-tap.i18n internationalizing packages 2014-11-24 11:27:07 +09:00
package.js use zh-CN as code for Chinese 2014-11-24 11:38:57 +09:00
versions.json Merge branch 'master' into quickform 2014-11-26 11:22:54 +09:00