Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-04-24 21:40:09 +02:00
commit 9fea01afef

View file

@ -287,7 +287,7 @@ public class IncrementalChangesManager {
private List<IncrementalUpdate> getIncrementalUpdates(String file, long timestamp) throws IOException, private List<IncrementalUpdate> getIncrementalUpdates(String file, long timestamp) throws IOException,
XmlPullParserException { XmlPullParserException {
String url = URL + "?timestamp=" + timestamp + "&file=" + URLEncoder.encode(file); String url = URL + "?aosmc=true&timestamp=" + timestamp + "&file=" + URLEncoder.encode(file);
HttpURLConnection conn = NetworkUtils.getHttpURLConnection(url); HttpURLConnection conn = NetworkUtils.getHttpURLConnection(url);
XmlPullParser parser = PlatformUtil.newXMLPullParser(); XmlPullParser parser = PlatformUtil.newXMLPullParser();
parser.setInput(conn.getInputStream(), "UTF-8"); parser.setInput(conn.getInputStream(), "UTF-8");