Commit graph

2 commits

Author SHA1 Message Date
Sacha Greif
50fc3eb11a Merge branch 'namespace' of https://github.com/TelescopeJS/Telescope into namespace
# Conflicts:
#	lib/users.js
#	packages/telescope-base/lib/base.js
#	packages/telescope-base/package.js
#	packages/telescope-lib
2015-04-20 13:57:37 +09:00
Delgermurun
057580b793 Settings package 2015-03-28 18:38:20 +09:00
Renamed from server/publications/settings.js (Browse further)