Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:43:48 +0000 (18:43 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:43:48 +0000 (18:43 +0200)
commit6f5cb9aacabe0ecf078717b876ef743f1e8f5f74
treeba8818867ebb8ae52a6dfcbdb9599f5391e3d5d5
parent6eccdc25b3e4ac9bb9c5686aa3e53f60ce07b59d
parent803f672663a3bd83aceac2c6bf1ac093acf7509d
Merge branch 'master' of https://github.com/owncloud/android into material_buttons