projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
fbfb6de
)
Merge remote-tracking branch 'origin/develop' into navigationDrawer_basic
author
masensio
<masensio@solidgear.es>
Mon, 15 Jun 2015 12:07:49 +0000
(14:07 +0200)
committer
masensio
<masensio@solidgear.es>
Mon, 15 Jun 2015 12:07:49 +0000
(14:07 +0200)
Conflicts:
.travis.yml
src/com/owncloud/android/authentication/AuthenticatorActivity.java
No differences found