| commit | 35b313ca0c637a58506c7ab87017958d1c54a5c3 | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Sat, 27 Aug 2011 14:35:42 +0000 (27 16:35 +0200) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Sat, 27 Aug 2011 14:35:42 +0000 (27 16:35 +0200) | ||
| tree | 18b658f4deeeb572004c3cc3aae2c0ca10e93026 | treesnapshot (tar.gz zip) |
| parent | 27f3db6ef04cf1df3c97b13bd542734bd0545cb4 | commitdiff |
| parent | 4ab348199f09ebcf913c33d747d6804f50d0a386 | commitdiff |
Merge branch 'sync-api' into couchdb
Conflicts:
mygpo/api/urls.py
Conflicts:
mygpo/api/urls.py
| mygpo/api/urls.py | diff1 | diff2 | blobhistory |