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 |
Марко М. Костић
|
68f19f9558
|
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-01-18 21:05:10 +00:00 |
lukebarnard
|
d55d3658f0
|
Use classNames instead of inline `style`
Theres no benefit to using inline styles
|
2018-01-18 18:08:18 +00:00 |
lukebarnard
|
3481283af8
|
Swap RoomList to react-beautiful-dnd
Includes themeing
See matrix-org/matrix-react-sdk#1711
|
2018-01-18 17:54:39 +00:00 |
Michael Telatynski
|
670f02acf8
|
Merge branches 'develop' and 't3chguy/highlight_things' of github.com:vector-im/riot-web into t3chguy/highlight_things
|
2018-01-16 18:04:08 +00:00 |
Weblate
|
ff70af3f34
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-16 13:05:37 +00:00 |
Xose M
|
6f47a9b8c3
|
Translated using Weblate (Galician)
Currently translated at 99.5% (219 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
|
2018-01-16 13:05:36 +00:00 |
Luke Barnard
|
a94208e230
|
Merge pull request #5992 from vector-im/luke/tag-panel-beautiful-dnd
CSS required as part of moving TagPanel from react-dnd to react-beautiful-dnd
|
2018-01-16 13:05:31 +00:00 |
Michael Telatynski
|
4386d45a97
|
remove 'use strict'
|
2018-01-16 10:27:47 +00:00 |
lukebarnard
|
c269abd434
|
CSS required as part of moving TagPanel from react-dnd to react-beautiful-dnd
|
2018-01-16 09:40:15 +00:00 |
Weblate
|
152f28bf2a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-15 13:45:20 +00:00 |
David Baker
|
f940dfdd79
|
Merge pull request #5984 from vector-im/t3chguy/datesep
fix&refactor DateSeparator and MessageTimestamp
|
2018-01-15 13:45:14 +00:00 |
Weblate
|
cf00ac34d9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-15 10:06:12 +00:00 |
toriko
|
a50e9d2b6b
|
Translated using Weblate (Japanese)
Currently translated at 33.1% (73 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
|
2018-01-15 10:06:11 +00:00 |
Jeff Huang
|
e2ef885aa6
|
Translated using Weblate (Chinese (Traditional))
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_Hant/
|
2018-01-15 10:06:10 +00:00 |
Michael Telatynski
|
f97395f40f
|
change exports to default to retain compatibility with existing imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-14 18:41:44 +00:00 |
Michael Telatynski
|
b65fdf6ab0
|
refactor MessageTimestamp, as it was missing a PropTypes def for ts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-14 18:35:53 +00:00 |
Michael Telatynski
|
22c024cc94
|
Refactor DateSep, use new Dateutils.formatFullDateNoTime
as it is not desired for it to include the time.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-14 18:34:38 +00:00 |
Neo_Chen
|
b99e87ba0a
|
Translated using Weblate (Chinese (Traditional))
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_Hant/
|
2018-01-13 00:44:59 +00:00 |
Klaus Marx
|
b023cc790b
|
Translated using Weblate (German)
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/de/
|
2018-01-12 09:32:20 +00:00 |
Michael Telatynski
|
5aec6840bf
|
Add cursor:pointer so that it actually looks clickable
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-11 19:33:21 +00:00 |
Michael Telatynski
|
17c4839029
|
only show reply button on REAL (not pending) m.room.message events
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-11 19:21:02 +00:00 |
Osoitz
|
26f377decf
|
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-01-11 12:55:14 +00:00 |
Szimszon
|
004ccc47b3
|
Translated using Weblate (Hungarian)
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/hu/
|
2018-01-11 12:34:32 +00:00 |
Andrey
|
fbd7860a9b
|
Translated using Weblate (Russian)
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/ru/
|
2018-01-11 10:47:32 +00:00 |
Kévin C
|
586533d6ea
|
Translated using Weblate (French)
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/fr/
|
2018-01-11 10:36:52 +00:00 |
Bamstam
|
c8bd89ce4c
|
Translated using Weblate (German)
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/de/
|
2018-01-11 10:36:29 +00:00 |
Weblate
|
1a9b86b27f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-11 10:34:48 +00:00 |
David Baker
|
56300f9578
|
Merge pull request #5804 from vector-im/t3chguy/nvl/rich_quoting
Implement Rich Quoting/Replies
|
2018-01-11 10:34:43 +00:00 |
Michael Telatynski
|
77e2ceba9e
|
switch to new ES6 DateUtils imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-10 21:50:32 +00:00 |
Weblate
|
54cafec57a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-08 15:18:08 +00:00 |
David Baker
|
24e16e5c18
|
Revert "Add a after timestamp"
|
2018-01-08 15:17:05 +00:00 |
Weblate
|
9c7783b439
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-08 15:00:51 +00:00 |
David Baker
|
b6c002b587
|
Fix merge
|
2018-01-08 14:35:39 +00:00 |
David Baker
|
9c3e4a1202
|
Merge branch 'develop' into patch-1
|
2018-01-08 14:31:21 +00:00 |
Iru Cai (vimacs)
|
97cc7f88ef
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (219 of 219 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
|
2018-01-08 02:02:11 +00:00 |
Michael Telatynski
|
290bf54d4f
|
pluralise properly
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-05 23:55:32 +00:00 |
Michael Telatynski
|
c68c54618f
|
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-05 23:19:43 +00:00 |
Michael Telatynski
|
3788fde711
|
Add a tooltip to members button and badge with actual count
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-05 23:16:21 +00:00 |
Weblate
|
9289d1a57d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-05 14:30:51 +00:00 |
David Baker
|
c8af65fff4
|
Merge branch 'hide-options-cp' of https://github.com/rubo77/vector-web into rubo77-hide-options-cp
|
2018-01-05 14:30:21 +00:00 |
Weblate
|
d2a676cad2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-03 15:48:44 +00:00 |
Sejo
|
33cf966f34
|
Translated using Weblate (Spanish)
Currently translated at 99.0% (217 of 219 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
|
2018-01-03 15:48:44 +00:00 |
Peter Vágner
|
760b961e19
|
Translated using Weblate (Slovak)
Currently translated at 100.0% (219 of 219 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
|
2018-01-03 15:48:44 +00:00 |
Joachim Nielandt
|
2660e70e00
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (219 of 219 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
|
2018-01-03 15:48:43 +00:00 |
Milan Korecký
|
f3f608b35f
|
Translated using Weblate (Czech)
Currently translated at 100.0% (219 of 219 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
|
2018-01-03 15:48:42 +00:00 |
Osoitz
|
34a3ef7e1d
|
Translated using Weblate (Basque)
Currently translated at 100.0% (219 of 219 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
|
2018-01-03 15:48:42 +00:00 |
nostradamos
|
762f6aaf0f
|
Merge remote-tracking branch 'upstream/develop' into fix_4821
|
2018-01-02 12:58:30 +01:00 |
Nostradamos
|
3600d1c667
|
moved max-height/min-height/overflow attributes to higher level to also include DraftEditorPlaceholder. Could fix https://github.com/vector-im/riot-web/issues/4821
|
2018-01-02 12:14:54 +01:00 |
Nathan van Beelen
|
ec5c960ebb
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (219 of 219 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
|
2017-12-22 19:01:48 +00:00 |
Joachim Nielandt
|
1f26a17b29
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (219 of 219 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
|
2017-12-22 07:52:44 +00:00 |
Michael Telatynski
|
8a7477f50c
|
Highlight ViewSource and Devtools ViewSource
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-12-20 20:40:41 +00:00 |
Xose M
|
17e0d3f8a0
|
Translated using Weblate (Galician)
Currently translated at 100.0% (219 of 219 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
|
2017-12-20 06:27:56 +00:00 |
Weblate
|
97116bb268
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-12-19 17:04:51 +00:00 |