From: Jessica Tallon <jessica@megworld.co.uk>
Date: Mon, 29 Sep 2014 08:04:30 +0000 (+0100)
Subject: Merge branch '942-default-location'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ffa9346cefcfc83d66b6da75ea4b4b8df682b08d;p=mediagoblin.git

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
---

ffa9346cefcfc83d66b6da75ea4b4b8df682b08d