Commit Graph

2 Commits (master)

Author SHA1 Message Date
eric bf220c5c6f Merge branch 'master' into push
# Conflicts:
#	settings/common.py
2016-05-20 16:44:13 -04:00
eric a466a251a0 add distro app 2016-05-16 16:50:09 -04:00