Ralitsa Bozhkova
|
54f4563303
|
Translated using Weblate (Bulgarian)
Currently translated at 14.3% (32 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
|
2018-02-13 22:03:02 +00:00 |
Matthew Hodgson
|
9abda76d9e
|
Merge branch 'develop' into luke/fix-tag-panel-collapse
|
2018-02-13 22:02:49 +00:00 |
Weblate
|
42582c7ccd
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-02-13 20:45:44 +00:00 |
Simó Albert i Beltran
|
c88a59c228
|
Translated using Weblate (Spanish)
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
|
2018-02-13 20:45:44 +00:00 |
Ralitsa Bozhkova
|
b54f949fe6
|
Translated using Weblate (Bulgarian)
Currently translated at 13.4% (30 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
|
2018-02-13 20:45:43 +00:00 |
Richard Lewis
|
55cacfba82
|
Temporary hack to constrain LLP container size.
|
2018-02-13 20:42:46 +00:00 |
Walter
|
3bc1eef39b
|
Translated using Weblate (Russian)
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
|
2018-02-13 18:56:54 +00:00 |
Simó Albert i Beltran
|
ee7add05ae
|
Translated using Weblate (Catalan)
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
|
2018-02-13 18:46:42 +00:00 |
Kévin C
|
e7d1c04bb5
|
Translated using Weblate (French)
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
|
2018-02-13 18:25:15 +00:00 |
Simó Albert i Beltran
|
247a3cebb9
|
Translated using Weblate (Spanish)
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
|
2018-02-13 18:00:42 +00:00 |
Weblate
|
03be7eb32c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-02-13 17:28:52 +00:00 |
Ralitsa Bozhkova
|
2524c5f861
|
Added translation using Weblate (Bulgarian)
|
2018-02-13 17:22:45 +00:00 |
Luke Barnard
|
11b0cc8211
|
Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu
|
2018-02-13 17:00:19 +00:00 |
Luke Barnard
|
285c4f91d3
|
Fix TagPanel from collapsing to < 60px when LP collapsed
Fixes https://github.com/vector-im/riot-web/issues/6133
|
2018-02-13 15:17:51 +00:00 |
Weblate
|
084ebe6e16
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-02-13 14:18:56 +00:00 |
David Baker
|
e67147213b
|
Merge pull request #6096 from vector-im/luke/room-list-flux
Make room tagging flux-y
|
2018-02-13 14:18:50 +00:00 |
Luke Barnard
|
85c0b8dea3
|
Adjust CSS to prevent scrollbars on message panel spinner
when clicking on permalinks/jump to first
|
2018-02-13 14:15:22 +00:00 |
Weblate
|
aec3c9961c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-02-13 10:00:58 +00:00 |
Oskars
|
c7aafd8410
|
Translated using Weblate (Latvian)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lv/
|
2018-02-13 10:00:57 +00:00 |
lighthawk
|
c0720d5d24
|
Translated using Weblate (Japanese)
Currently translated at 33.3% (74 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
|
2018-02-13 10:00:57 +00:00 |
Luke Barnard
|
2269c94579
|
Move groups button to TagPanel
|
2018-02-13 09:44:25 +00:00 |
Luke Barnard
|
e36baa8c3a
|
Fix quotes on import
|
2018-02-12 18:47:29 +00:00 |
Luke Barnard
|
d47c9d8b6e
|
Add context menu to TagPanel
See https://github.com/matrix-org/matrix-react-sdk/pull/1743
|
2018-02-12 18:02:55 +00:00 |
Oskars
|
93a381218c
|
Translated using Weblate (Latvian)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lv/
|
2018-02-10 12:34:50 +00:00 |
Weblate
|
47df5d2d60
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-02-09 12:28:42 +00:00 |
Osoitz
|
d3c1072842
|
Translated using Weblate (Basque)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
|
2018-02-09 12:28:40 +00:00 |
David Baker
|
d904212033
|
Merge branch 'release-v0.13.5' into develop
|
2018-02-09 12:28:26 +00:00 |
David Baker
|
62e90ceb0d
|
Sanity check URLs with isUrlPermitted
Thanks to walle303 for letting us know these weren't being checked.
|
2018-02-09 12:20:31 +00:00 |
Luke Barnard
|
0cdebcce89
|
Move sublist sorting to RoomListStore
NB: fixUndefinedOrdering was removed completely because it was
code dealing with legacy favourites.
see matrix-org/matrix-react-sdk@9b0df191
|
2018-02-08 16:28:42 +00:00 |
Luke Barnard
|
495090c9ba
|
Remove now unused RoomSubList code
|
2018-02-08 14:08:20 +00:00 |
Марко М. Костић
|
f41a70fe1f
|
Translated using Weblate (Serbian)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
|
2018-02-07 20:36:40 +00:00 |
Weblate
|
bdbf0427a1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-02-07 18:03:48 +00:00 |
lukebarnard
|
4b7561a75e
|
Fix long group name pushing settings cog into void
|
2018-02-07 17:40:00 +00:00 |
Simó Albert i Beltran
|
31af7c583f
|
Translated using Weblate (Spanish)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
|
2018-02-07 13:57:00 +00:00 |
Weblate
|
2d0ea28a39
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-02-07 12:14:15 +00:00 |
Марко М. Костић
|
0f475a0e10
|
Translated using Weblate (Serbian)
Currently translated at 98.6% (219 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
|
2018-02-07 12:14:15 +00:00 |
Robert A. Viana
|
f3bae5c090
|
Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.5% (221 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
|
2018-02-07 12:14:14 +00:00 |
Szimszon
|
ca2767fd04
|
Translated using Weblate (Hungarian)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
|
2018-02-07 12:14:14 +00:00 |
Krombel
|
c659c81341
|
Translated using Weblate (German)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
|
2018-02-07 12:14:14 +00:00 |
Kévin C
|
7eab0eca5b
|
Translated using Weblate (French)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
|
2018-02-07 12:14:14 +00:00 |
lukebarnard
|
95c45362d5
|
Fix horizontal scrollbar under certain circumstances
specifically when trailing whitespace is not wrapped onto the next
line of the block.
Fixes #6077
|
2018-02-07 12:02:00 +00:00 |
Jeff Huang
|
8efce30d7f
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
|
2018-02-07 11:57:50 +00:00 |
Peter Vágner
|
44a727b205
|
Translated using Weblate (Slovak)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
|
2018-02-07 08:56:04 +00:00 |
lukebarnard
|
662942ec29
|
Use dispatch to change room tags from RoomTileContextMenu
|
2018-02-06 11:52:39 +00:00 |
lukebarnard
|
83996c09d9
|
General delint, cleanup
|
2018-02-06 11:51:46 +00:00 |
lukebarnard
|
e46f436a47
|
Prefer context.matrixClient in LeftPanel
|
2018-02-06 11:50:34 +00:00 |
Simó Albert i Beltran
|
3cbaa95184
|
Translated using Weblate (Catalan)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
|
2018-02-06 10:41:59 +00:00 |
Weblate
|
8c75bed687
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-02-05 14:28:03 +00:00 |
Марко М. Костић
|
481476f835
|
Translated using Weblate (Serbian)
Currently translated at 98.6% (219 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
|
2018-02-05 14:28:03 +00:00 |
Luke Barnard
|
680a0191be
|
Merge pull request #6067 from vector-im/t3chguy/fix_usercontent_pointer
Split MImageBody into MFileBody to match JS Classes.
|
2018-02-05 14:27:57 +00:00 |
Michael Telatynski
|
3abf1458fb
|
Add cursor:pointer so that calculated CSS includes it for iframe style
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-02-05 13:25:43 +00:00 |
Michael Telatynski
|
00b7cc512b
|
Split MImageBody into MImageBody,MFileBody to match react-sdk
and having the classnames match their components.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-02-05 13:25:09 +00:00 |
Nathan van Beelen
|
2a58de5cfc
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
|
2018-02-04 14:24:39 +00:00 |
Osoitz
|
c3b000a368
|
Translated using Weblate (Basque)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
|
2018-02-02 08:28:22 +00:00 |
Kévin C
|
675bebee33
|
Translated using Weblate (French)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
|
2018-02-01 17:46:52 +00:00 |
Szimszon
|
cefd744aba
|
Translated using Weblate (Hungarian)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
|
2018-02-01 16:15:54 +00:00 |
Krombel
|
325c9662c5
|
Translated using Weblate (German)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
|
2018-02-01 15:13:02 +00:00 |
Andrey
|
8b35a7b10f
|
Translated using Weblate (Russian)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
|
2018-02-01 11:33:01 +00:00 |
Weblate
|
a6155c98ec
|
Merge branch 'develop' of https://github.com/vector-im/riot-web into develop
Conflicts:
src/i18n/strings/eo.json
|
2018-02-01 10:24:21 +00:00 |
Марко М. Костић
|
a26473b722
|
Translated using Weblate (Serbian)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
|
2018-02-01 09:48:47 +00:00 |
Xose M
|
ed5162ef4e
|
Translated using Weblate (Galician)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
|
2018-02-01 09:48:46 +00:00 |
Tong Hui
|
930deaea9d
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
|
2018-02-01 09:48:45 +00:00 |
Simó Albert i Beltran
|
b80be62bb7
|
Translated using Weblate (Catalan)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
|
2018-02-01 09:48:45 +00:00 |
Osoitz
|
11806f2aa2
|
Translated using Weblate (Basque)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
|
2018-02-01 09:48:45 +00:00 |
Walter
|
078d156824
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
|
2018-01-29 17:06:45 +00:00 |
Iru Cai (vimacs)
|
88c4cb6eba
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
|
2018-01-27 16:55:15 +00:00 |
Xose M
|
bc4f8c4c2a
|
Translated using Weblate (Galician)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
|
2018-01-26 14:26:24 +00:00 |
d1d4c
|
7ee205a447
|
Translated using Weblate (Catalan)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
|
2018-01-26 13:06:57 +00:00 |
Ramon Vilar
|
f6c49a2472
|
Translated using Weblate (Catalan)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
|
2018-01-26 02:25:21 +00:00 |
lukebarnard
|
37fe3ac676
|
Prevent RoomTiles from being dragged into other droppables
for the time being at least.
|
2018-01-25 22:51:40 +01:00 |
lukebarnard
|
2926154dce
|
Modify LeftPanel to include a DragDropContext
that handles drag and drop for TagPanel and RoomList. This is to
allow the future feature of dragging between the two components.
|
2018-01-25 22:30:58 +01:00 |
Michael Telatynski
|
662a6297e7
|
FilteredList, now being a controlled component does not need state
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-25 21:06:35 +00:00 |
Michael Telatynski
|
04bca93e0d
|
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools-118247
|
2018-01-25 20:59:31 +00:00 |
d1d4c
|
5c6a265b86
|
Translated using Weblate (Catalan)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
|
2018-01-24 17:53:36 +00:00 |
David Baker
|
b0a3bd6591
|
Merge pull request #6017 from vector-im/t3chguy/rich_quoting_linear
Linear Rich Quoting
|
2018-01-24 18:53:33 +01:00 |
d1d4c
|
8b7a941a6e
|
Translated using Weblate (Catalan)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
|
2018-01-24 08:55:16 +00:00 |
Michael Telatynski
|
22b7298542
|
add comments
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-23 20:28:39 +00:00 |
Michael Telatynski
|
9d1a3c9011
|
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things
|
2018-01-23 20:19:27 +00:00 |
Michael Telatynski
|
c2aa8137bb
|
sort components scss
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-23 20:02:47 +00:00 |
d1d4c
|
4d0b02c683
|
Translated using Weblate (Catalan)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
|
2018-01-23 19:46:06 +00:00 |
Peter Vágner
|
0df6f85843
|
Translated using Weblate (Slovak)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
|
2018-01-22 22:21:55 +00:00 |
A.G
|
13dd8e2c76
|
Translated using Weblate (Italian)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
|
2018-01-22 22:21:55 +00:00 |
Luke Barnard
|
9d387c32a5
|
Merge pull request #5929 from vector-im/t3chguy/num_members_tooltip
T3chguy/num members tooltip
|
2018-01-22 22:21:50 +00:00 |
Michael Telatynski
|
f5fc86258f
|
s/Highlight/SyntaxHighlight/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-22 18:59:18 +00:00 |
Michael Telatynski
|
321f16d8a3
|
rename variable as it was horrible to read camelCased
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-22 18:54:22 +00:00 |
Michael Telatynski
|
d57a10e0b2
|
Merge branches 'develop' and 't3chguy/rich_quoting_linear' of github.com:vector-im/riot-web into t3chguy/rich_quoting_linear
|
2018-01-22 16:53:51 +00:00 |
Michael Telatynski
|
202f0e2163
|
Add EventTile_quote styling for less margin-right when in QuotePreview
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-22 16:42:08 +00:00 |
pincopallopino
|
77d8fe3ef1
|
Translated using Weblate (Italian)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
|
2018-01-20 23:00:26 +00:00 |
A.G
|
3e5833e9f2
|
Translated using Weblate (Italian)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
|
2018-01-20 22:59:29 +00:00 |
pincopallopino
|
2b26be73f6
|
Translated using Weblate (Italian)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
|
2018-01-20 22:59:22 +00:00 |
A.G
|
ce6338b853
|
Translated using Weblate (Italian)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
|
2018-01-20 22:59:12 +00:00 |
vricci
|
52c5293a12
|
Translated using Weblate (Italian)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
|
2018-01-20 22:59:04 +00:00 |
A.G
|
568e1f4f90
|
Translated using Weblate (Italian)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
|
2018-01-20 22:58:48 +00:00 |
vricci
|
29f05c09d6
|
Translated using Weblate (Italian)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
|
2018-01-20 22:58:18 +00:00 |
A.G
|
888a77b4bb
|
Translated using Weblate (Italian)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
|
2018-01-20 22:57:00 +00:00 |
pebles
|
4eeb7989f6
|
Translated using Weblate (Spanish)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
|
2018-01-20 16:34:07 +00:00 |
Michael Telatynski
|
3764a5d4b7
|
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things
|
2018-01-20 13:55:52 +00:00 |
Peter Vágner
|
189b7236af
|
Translated using Weblate (Slovak)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
|
2018-01-20 11:54:14 +00:00 |
Matthew Hodgson
|
8855cc294e
|
converge on 'noisy' to mean noisy notifs
|
2018-01-19 16:52:54 +00:00 |
Weblate
|
935b85afe7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-19 14:49:58 +00:00 |