Sacha Greif 77140ac09f Merge branch 'comments-login' of https://github.com/xavcz/Telescope into xavcz-comments-login ... # Conflicts: # .meteor/versions # packages/nova-base-components/lib/users/AccountsMenu.jsx # packages/nova-base-components/package.js		2016-04-03 11:30:31 +09:00
..
lib	Merge branch 'comments-login' of https://github.com/xavcz/Telescope into xavcz-comments-login	2016-04-03 11:30:31 +09:00
package.js	Updated to latest version of std:accounts-ui	2016-04-02 23:19:32 +02:00