| commit | c6945369c41784f48dd30135471728e4481fd79e | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Tue, 12 Jun 2012 15:11:03 +0000 (12 17:11 +0200) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Tue, 12 Jun 2012 15:11:03 +0000 (12 17:11 +0200) | ||
| tree | 2671c932366e92f4cf77f46c1917bcc702c8b8b3 | treesnapshot (tar.gz zip) |
| parent | c508cb764d64e9ac4dc0ddb6213a216467fe39b2 | commitdiff |
| parent | 6ccfb69b1027eccd7245dda10c49d5789b3b8040 | commitdiff |
Merge branch 'master' into design
Conflicts:
mygpo/api/backend.py
mygpo/web/views/__init__.py
Conflicts:
mygpo/api/backend.py
mygpo/web/views/__init__.py
| mygpo/api/backend.py | diff1 | diff2 | blobhistory |
| mygpo/web/views/__init__.py | diff1 | diff2 | blobhistory |