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
3fd6d604fe
notebook/app
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
..
assets Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
controllers Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
helpers Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
mailers Merge resolution 2015-03-13 20:12:42 -05:00
models Include fix for #378 2015-03-13 20:15:54 -05:00
views Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00