Merge remote-tracking branch 'remotes/upstream/uploadWhenCharging' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Mon, 26 Oct 2015 21:15:56 +0000 (22:15 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Mon, 26 Oct 2015 21:15:56 +0000 (22:15 +0100)
commit7b780553be6b386d226b5b22e08291f0cbcfb931
tree38fba1a918a1fa63402bbd0f0ac737fff24d2539
parentdb406ff4f2c06aa072eb6a68a0866cecf2df439c
parente92297ccafca3ef891ced6f2a88e532f4e3813f6
Merge remote-tracking branch 'remotes/upstream/uploadWhenCharging' into beta