mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
4ef4e082ff
notebook/app/views/layouts
History
Andrew Brown 3fd6d604fe Revert "Revert "Resolve merge with master"" 
This reverts commit 6f8ae925ba.

Conflicts:
	app/assets/stylesheets/bootplus_overrides.css.less
2015-03-13 22:46:31 -05:00
..
_bootstrap_includes.html.erb Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
_future_navbar.html Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
_ganalytics.html.erb add google analytics 2013-03-11 22:49:42 -05:00
_login_box.html.erb Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
_navbar.html.erb Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
_noscript_notice.html.erb Add noscript notice 2013-12-08 17:55:03 -05:00
_session_protection.html.erb Change Mongo reference to ActiveRecord reference 2015-03-13 20:15:54 -05:00
_sidebar.html.erb Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
application.html.erb Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00