Commit graph

3 commits

Author SHA1 Message Date
Sacha Greif
08c6e373fc bringing packages back into core repo after all 2015-04-22 07:50:11 +09:00
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
Sacha Greif
51de4d79db splitting settings form into field sets 2014-09-28 16:31:12 +09:00