Hugo Soucy 951d35e945 Merge branch 'master' of github.com:titilambert/adagios-frontend ...

Conflicts:
	app/index.html
	app/navbar/navbar.js
	app/sidebar/sidebar.js
	app/topbar/topbar.css
	app/topbar/topbar.html

2015-01-22 14:19:10 -05:00

..

topbar_test.js

Rename navbar to topbar

2015-01-16 17:12:59 -05:00

topbar.css

Rename navbar to topbar

2015-01-16 17:12:59 -05:00

topbar.html

Merge branch 'master' of github.com:titilambert/adagios-frontend

2015-01-22 14:19:10 -05:00

topbar.js

Rename navbar to topbar

2015-01-16 17:12:59 -05:00