projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 5665d9c)
Merge tag 'oc-android-1-3-22' into oauth_login
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 18 Mar 2013 13:28:49 +0000 (14:28 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 18 Mar 2013 13:28:49 +0000 (14:28 +0100)
Conflicts:
AndroidManifest.xml
src/com/owncloud/android/authenticator/AuthenticationRunnable.java
src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
src/com/owncloud/android/authenticator/OnConnectCheckListener.java
src/com/owncloud/android/files/services/FileOperation.java
src/com/owncloud/android/files/services/InstantUploadService.java
src/com/owncloud/android/ui/activity/AuthenticatorActivity.java


No differences found
ownCloud Android App