Viewing all changes in revision 64.

Committer: Caio Begotti
Date: 2015-04-01 20:31:17 UTC
mfrom: <a title="Merged From 63.1.2" href="/~roadmr/capomastro/charm-force-python-django-version-again/revision/63.1.2">(63.1.2 charm)
Revision ID: caio.begotti@canonical.com-20150401203117-dhto9pz29fv5e94z

merge how we will be handling conffiles now, respecting the old settings and overwriting only unchanged files

added added

removed removed