| commit | db5304ba69956c405ec4d52122aeb9d863218024 | |
| author | Jason Michalski <armooo@armooo.net> | |
| Mon, 3 Dec 2007 03:36:08 +0000 (2 21:36 -0600) | ||
| committer | Jason Michalski <armooo@armooo.net> | |
| Mon, 3 Dec 2007 03:36:08 +0000 (2 21:36 -0600) | ||
| tree | 1367bca9393f4f829f77b1fe6798cb8fc67b6dec | treesnapshot (tar.gz zip) |
| parent | f119c965fdada55f12312fd1eed9e5dbc4f32b49 | commitdiff |
| parent | df37f8482406e455b5a03c8382cad2372571adc4 | commitdiff |
Merge branch 'master' into subfolders-8.3
Conflicts:
config.py
Conflicts:
config.py
| config.py | diff1 | diff2 | blobhistory |
| plugins/video/transcode.py | diff1 | diff2 | blobhistory |