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 |
|