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
4ff118e112
notebook/app/views/languages
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
..
_form.html.erb Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
_list.html.erb Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
_tabs.html.erb Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
edit.html.erb Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
index.html.erb Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
new.html.erb Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
show.html.erb Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00