diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 18:59:27 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 18:59:27 -0500 |
| commit | 02fdb37d55ec1158162d4c35c3b43d1bcd4e58fa (patch) | |
| tree | 45ac74e9bf50a787f0dd37250b82ce406654f53e /devel/views.py | |
| parent | 785ca5da915b5edc3123dcdeb4994fdfca7e416d (diff) | |
| parent | 60c8c00c4f7c2deddcfb1cade8e48d56dca2e9ad (diff) | |
Merge commit '60c8c00' (update)
Conflicts:
templates/base.html
Diffstat (limited to 'devel/views.py')
0 files changed, 0 insertions, 0 deletions