| commit | 86d01f0816d3ccfb481a0e4218aa68d8e780c4f1 | |
| author | Christopher Allan Webber <cwebber@dustycloud.org> | |
| Sun, 20 Dec 2015 03:57:27 +0000 (19 21:57 -0600) | ||
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | |
| Sun, 20 Dec 2015 03:57:27 +0000 (19 21:57 -0600) | ||
| tree | 7f67ae6862f2b21f9d9c661e6670867c8c028f94 | treesnapshot (tar.gz zip) |
| parent | f1db51e4db689a7f68973ce466b01918af1f4e37 | commitdiff |
| parent | 6e38fec80ebaadc3b3cfdc912f40cc4e8bb9b31c | commitdiff |
Merge branch 'stable'
Conflicts:
mediagoblin/i18n/templates/en/mediagoblin.po
mediagoblin/plugins/archivalook/tools.py
Conflicts:
mediagoblin/i18n/templates/en/mediagoblin.po
mediagoblin/plugins/archivalook/tools.py
| mediagoblin/i18n/templates/en/mediagoblin.po | diff1 | diff2 | blobhistory |