diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-03-25 18:43:47 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-03-25 18:43:47 +0100 |
commit | 1fe6a52803b4d78f57f52cdbe138010cc4c00f80 (patch) | |
tree | 3eb44592abefec9ab8a2ee0981eba4ada17d9a1a /papillon/polls/forms.py | |
parent | 3fcdf69304580650c6244165aae0b1fc46221cff (diff) | |
parent | 525fdda2aaae3adc8534ebda777dedddb17ef25f (diff) | |
download | Papillon-1fe6a52803b4d78f57f52cdbe138010cc4c00f80.tar.bz2 Papillon-1fe6a52803b4d78f57f52cdbe138010cc4c00f80.zip |
Merge branch 'responsive' of https://github.com/Trim/papillon into responsive
Conflicts:
papillon/templates/base.html
Diffstat (limited to 'papillon/polls/forms.py')
0 files changed, 0 insertions, 0 deletions