Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8e77d36d authored by tobiasKaminsky's avatar tobiasKaminsky
Browse files

changes due to rebase 



Signed-off-by: default avatartobiasKaminsky <tobias@kaminsky.me>
parent 717d7ab3

src/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ import com.owncloud.android.lib.common.utils.Log_OC; 
import com.owncloud.android.lib.resources.activities.model.Activity;

import com.owncloud.android.lib.resources.activities.model.RichElement;

import com.owncloud.android.lib.resources.activities.model.RichElementTypeAdapter;

import com.owncloud.android.lib.resources.activities.models.PreviewObject;

import com.owncloud.android.lib.resources.activities.models.PreviewObjectAdapter;

import com.owncloud.android.lib.resources.status.OwnCloudVersion;



import org.apache.commons.httpclient.Header;

src/com/owncloud/android/lib/resources/activities/model/Activity.java

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
package com.owncloud.android.lib.resources.activities.model;



import com.google.gson.annotations.SerializedName;

import com.owncloud.android.lib.resources.activities.models.PreviewObject;



import java.util.ArrayList;

import java.util.Date;