Merge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links

This commit is contained in:
Michael Vogel
2015-07-06 17:35:48 +02:00
7 changed files with 15254 additions and 15417 deletions
+6306 -6419
View File
File diff suppressed because it is too large Load Diff
+1280 -1281
View File
File diff suppressed because it is too large Load Diff
+6325 -6430
View File
File diff suppressed because it is too large Load Diff
+1281 -1280
View File
File diff suppressed because it is too large Load Diff