aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-11-07 09:49:32 +0100
committerChristian S <christian@pix-art.de>2015-11-07 09:49:32 +0100
commitfc4ead341f9015fe106f2f267a113bb13ccb2fd4 (patch)
treec349a29cd0cf9add802b7416c8db457644dc8402 /src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
parenta8cdf281a078285fe38f7a7f8de22f6b1f9462b9 (diff)
parentc6e54e7e5a3e402553d2f57e2997fb80d029d559 (diff)
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java')
0 files changed, 0 insertions, 0 deletions