projects
/
qcg-portal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
cc19da4
)
Merge remote-tracking branch 'origin/master'
author
Maciej Tronowski
<mtro@man.poznan.pl>
Fri, 27 Feb 2015 16:17:15 +0000
(17:17 +0100)
committer
Maciej Tronowski
<mtro@man.poznan.pl>
Fri, 27 Feb 2015 16:17:15 +0000
(17:17 +0100)
# Conflicts:
# plgng/settings.py
# qcg/forms.py
# qcg/views.py
No differences found