Merge branch 'master' of github.com:siacs/Conversations

iNPUTmice created 11 years ago

Conflicts:
	src/eu/siacs/conversations/crypto/PgpEngine.java
	src/eu/siacs/conversations/persistance/FileBackend.java
	src/eu/siacs/conversations/ui/ShareWithActivity.java

Change summary

src/eu/siacs/conversations/ui/ShareWithActivity.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Detailed changes

src/eu/siacs/conversations/ui/ShareWithActivity.java

@@ -182,4 +182,4 @@ public class ShareWithActivity extends XmppActivity {
 
 	}
 
-}
+}