Merge branch '942-default-location'
authorJessica Tallon <jessica@megworld.co.uk>
Mon, 29 Sep 2014 08:04:30 +0000 (09:04 +0100)
committerJessica Tallon <jessica@megworld.co.uk>
Mon, 29 Sep 2014 08:04:30 +0000 (09:04 +0100)
commitffa9346cefcfc83d66b6da75ea4b4b8df682b08d
treeb263f40a8e68d85047324be05990e3005c0c445a
parentbecd160703451a77481a453b7bd33b8e594b31f5
parent11f0e2f89bade7f3d38665968adf478c3b039c5d
Merge branch '942-default-location'

* 942-default-location:
  Add documentation on changing data dir and Fix stylistic changes
  Updated config_spec.ini to add %(data_basedir)s and make use of it!
  defaults now pulled from a mashup of mediagoblin.ini and config_spec.ini