Vulcan/client/views
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
..
admin Settings package 2015-03-28 18:38:20 +09:00
comments Fix #887 (thanks @kai101) 2015-04-08 09:05:15 +09:00
common Merge branch 'settings-package' of https://github.com/delgermurun/Telescope into delgermurun-settings-package 2015-04-08 09:20:50 +09:00
errors Settings package 2015-03-28 18:38:20 +09:00
forms clean up tags package 2015-03-26 11:36:29 +09:00
nav Merge branch 'settings-package' of https://github.com/delgermurun/Telescope into delgermurun-settings-package 2015-04-08 09:20:50 +09:00
posts Merge branch 'settings-package' of https://github.com/delgermurun/Telescope into delgermurun-settings-package 2015-04-08 09:20:50 +09:00
users add city field to profile 2015-04-03 18:52:44 +09:00