Andrew Brown b7771f4a27 Merge branch 'master' of https://github.com/indentlabs/Indent		2016-07-31 02:00:39 -05:00
..
birthings.yml	Character birthplace / tweaking for Character-->Location relations	2016-05-03 15:46:58 -05:00
mordor_map.jpg	Write controller tests for image upload for #416	2015-03-24 09:27:13 -05:00
ownerships.yml	add proof of concept editor	2016-07-31 00:20:28 -05:00
shire_map.jpg	Move test image to fixtures folder	2015-03-24 09:26:54 -05:00