notebook/app
Andrew Brown 577de5f447 Merge branch 'master' into thredded
Conflicts:
	db/schema.rb
2017-09-30 15:44:27 +02:00
..
assets Merge branch 'master' into thredded 2017-09-30 15:44:27 +02:00
authorizers Delete empty attribute categories after deleting the last attribute in them, fixes #191 2017-03-24 23:04:02 +00:00
controllers Merge branch 'master' into thredded 2017-09-30 15:44:27 +02:00
helpers Add Flora model #migration 2017-07-31 02:39:13 +02:00
mailers Merge resolution 2015-03-13 20:12:42 -05:00
models Merge branch 'master' into thredded 2017-09-30 15:44:27 +02:00
services Rename app internally from PlanCharacters to Notebook 2017-05-23 19:59:01 +00:00
views Merge branch 'master' into thredded 2017-09-30 15:44:27 +02:00