Merge remote-tracking branch 'origin/develop' into develop

Browse Source

pull/4290/head

Weblate 2017-06-13 09:06:26 +00:00

parent 5812dd8f3f 5e530a2065

commit f2f8c19f2f

2 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

res/home/rooms/riot-ios.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.7 KiB After Width:  |  Height:  |  Size: 5.2 KiB

BIN

res/home/rooms/riot-translations.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 146 B After Width:  |  Height:  |  Size: 8.2 KiB