Merge remote-tracking branch 'origin/develop' into add_cookie_based_session_support
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 1 Jul 2014 12:21:26 +0000 (14:21 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 1 Jul 2014 12:21:26 +0000 (14:21 +0200)
commitdacc14a882be8b499c00ad2f75b68e10a42dee9e
tree6679a7adf7b70f8025abf37aad6da492b2f5a1d0
parent1958964f56e469ff304b2f992ecad2116e53b0b8
parentf773d58d86da535d4d0f451b5d8138338d731350
Merge remote-tracking branch 'origin/develop' into add_cookie_based_session_support
owncloud-android-library
res/values/strings.xml