Merge pull request #186 from owncloud/fixed_contradicted_messages_in_login_view
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FailedUploadActivity.java
2013-06-06 masensioUpdate branch with develop branch
2013-05-06 David A. VelascoMerge branch 'develop' into file_browsing_refactoring
2013-05-03 David A. VelascoMerge branch 'develop' into fixForCrashedSharedContents
2013-05-03 David A. VelascoMerge pull request #152 from owncloud/oauth_login
2013-05-03 David A. VelascoMerge branch 'develop' into oauth_login
2013-04-25 David A. VelascoMerge branch 'develop' into oauth_login
2013-04-17 David A. VelascoCopyright note fixes
2013-04-15 David A. VelascoMerge branch 'develop' into loggingtool
2013-04-12 David A. VelascoMerge branch 'bug_hunting' into develop
2013-04-09 David A. VelascoMerge branch 'bug_hunting' into feature_previews
2013-04-04 David A. VelascoMerge branch 'bug_hunting' into feature_previews
2013-04-04 David A. VelascoMerge branch 'develop' into feature_previews
2013-03-17 Matthias Baumann- exclude none InstantUpload from InstantUploadActivity