Merge remote-tracking branch 'remotes/upstream/1193_uploader_layout' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 20 Nov 2015 17:36:50 +0000 (18:36 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 20 Nov 2015 17:36:50 +0000 (18:36 +0100)
commit8a9983f7311a6bf46dadd7dc73265db240fa8682
tree8031cc5e072d236b529892b0647a8f55838d6797
parente35e32ad52f3964a44f0f404adf699e0d18502de
parentdf001d5dfd541cfe58fd964d47db3f4ea98d99fc
Merge remote-tracking branch 'remotes/upstream/1193_uploader_layout' into beta