Commit graph

3 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
Sacha Greif
7a219a738d add pages to mobile nav; various CSS fixes 2015-04-09 10:02:50 +09:00
Sacha Greif
2b05abf527 adding pages package 2015-04-08 18:23:29 +09:00