Andrew Brown 6f381c889d Merge branch 'master' into achetype ... Conflicts: db/schema.rb		2016-10-04 00:16:56 +02:00
..
concerns	Change is_public logic	2016-09-22 15:30:56 -05:00
content_groupers	Add 'past owners' relation on items	2016-10-02 01:41:31 +02:00
character.rb	Add archetype to character information	2016-10-02 22:24:52 -05:00
item.rb	Add 'past owners' relation on items	2016-10-02 01:41:31 +02:00
location.rb	author page polish	2016-10-01 17:35:59 +02:00
ownership.rb	add proof of concept editor	2016-07-31 00:20:28 -05:00
universe.rb	author page polish	2016-10-01 17:35:59 +02:00
user.rb	author page polish	2016-10-01 17:35:59 +02:00