1
0
mirror of https://github.com/owncloud/android-library.git synced 2026-08-20 04:43:01 +00:00

Merge branch 'develop' into regular_authentication_in_saml_server

This commit is contained in:
David A. Velasco
2014-03-21 11:01:49 +01:00
7 changed files with 23 additions and 21 deletions
@@ -42,7 +42,8 @@ public class WebdavUtils {
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US),
new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US),
new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US),
new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US) };
new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US) ,
new SimpleDateFormat("yyyy-MM-dd hh:mm:ss") };
public static String prepareXmlForPropFind() {
String ret = "<?xml version=\"1.0\" ?><D:propfind xmlns:D=\"DAV:\"><D:allprop/></D:propfind>";