2 Commits

Author SHA1 Message Date
Adarnof
35277b7f33 Manual conflict resoltuion for pull request #98 2015-11-25 02:59:13 +00:00
Adarnof
db7b6265e5 Moved templates to stock folder for uniformity.
Updated settings.py.example to reflect this.
2015-11-24 23:26:05 +00:00