Commit graph

4 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
666577f4cb Template[getTemplate('XYZ')] => Template.XYZ 2015-04-13 14:52:03 +09:00
Sacha Greif
ed0e7ef270 fix user dashboard css 2015-03-25 10:11:44 +09:00
Sacha Greif
51b52da004 working on admin menu 2015-03-23 10:32:56 +09:00