notebook/app/views
Andrew Brown 6f381c889d Merge branch 'master' into achetype
Conflicts:
	db/schema.rb
2016-10-04 00:16:56 +02:00
..
admin Merge master 2016-09-29 20:06:41 -05:00
cards Make serendipitous card more robust 2016-10-02 14:47:52 -05:00
characters Remove practmatic_context gem 2016-09-06 18:37:15 -05:00
content Add archetype to character information 2016-10-02 22:24:52 -05:00
devise Merge branch 'master' into slack-stats 2016-09-30 02:23:01 +02:00
items Add ID and Name JSON LD to all content show pages 2016-09-06 18:47:21 -05:00
layouts Revert "Add emergency maintenance notice" 2016-10-03 23:53:27 +02:00
locations Close a tag I missed 2016-09-19 21:16:52 -05:00
main Verbiage tweaks on landing page 2016-10-01 18:28:02 +02:00
sessions ponr: replace custom login with devise login 2016-04-06 15:04:06 -05:00
siblingship Siblingship join model 2016-04-29 14:01:35 -05:00
universes Content show/edit pages polish 2016-09-29 15:58:30 +02:00
users author page polish 2016-10-01 17:35:59 +02:00
write Dat polish tho 2016-08-04 00:51:48 -05:00