55da52debd
v1.0.0
2019-02-14 17:07:27 +00:00
21f11f02a4
v1.0.0-rc.2
2019-02-14 11:19:06 +00:00
32c958e2f2
Merge branch 'develop' into release-v1.0.0
2019-02-14 11:17:18 +00:00
db30c24b9f
Updated app icons
2019-02-13 17:58:57 +00:00
bbbb4c7861
run icons script on new icon
2019-02-13 17:28:28 +00:00
a51c0744e6
v1.0.0-rc.1
2019-02-08 18:45:53 +00:00
a03a738317
Only allow Electron to zoom with CommandOrControl+=
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-06 13:20:40 -06:00
bfdffc653e
Allow Electron to zoom with CommandOrControl+=
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-02 15:53:10 -06:00
90140f6361
Merge pull request #8321 from vector-im/experimental
...
Merge redesign into develop
2019-01-30 12:49:37 +00:00
2aaed5d4c3
Doc broken will-navigate listener
2019-01-24 11:36:36 +00:00
a0c205e4c9
v0.17.9
2019-01-22 11:44:13 +00:00
e94e712d49
v0.17.9-rc.1
2019-01-17 11:07:42 +00:00
8c895cd435
Correct the copying of e-mail addresses in the electron app
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-01-15 08:37:01 +00:00
62a49af23f
Only serve origin migrator whilst migrating
...
as per comment
2018-12-21 22:21:06 +00:00
751a1dc543
Add tool to migrate logins between origins
...
App checks at startup for an existing session, if there isn't one,
it will start the tool to check for a login in the file:// origin.
If there is one, it will copy the login over to the vector://vector
origin.
In principle this could also be used to migrate logins between
other origins on the web if this were ever required.
This includes a minified copy of the browserified js-sdk with
a getAllEndToEndSessions() function added to the crypto store
(https://github.com/matrix-org/matrix-js-sdk/pull/812 ). This is
not great, but for a short-lived tool this seems better than
introducing more entry points into webpack only used for the
electron app.
2018-12-21 19:14:25 +00:00
b6d70f4434
Missing include
2018-12-19 12:25:32 +00:00
fc4e1485ad
Electron: Load app from custom protocol
...
This puts the app into its own origin so it doesn't have access
to the filesystem via file:// URIs.
Next step: migrate over localstorage & indexeddb data from the old
origin...
2018-12-19 12:04:40 +00:00
b35903bb19
Merge pull request #7907 from vector-im/dbkr/electron_sandbox
...
Run the Desktop app in a sandbox
2018-12-19 09:48:10 +00:00
60d3076038
Update to new electron single instance API
2018-12-18 18:10:09 +00:00
19f1489c92
Run the Desktop app in a sandbox
...
* Turn off node integration in the electron renderer process
* Enable the chromium sandbox to put the renderer into its own process
* Expose just the ipc module with a preload script
* Introduce a little IPC call wrapper so we can call into the
renderer process and await on the result.
* Use this in a bunch of places we previously used direct calls
to electron modules.
* Convert other uses of node, eg. use of process to derive the
platform (just look at the user agent)
* Strip out the desktopCapturer integration which doesn't appear
to have ever worked (probably best to just wait until
getDisplayMedia() is available in chrome at this point:
https://github.com/vector-im/riot-web/issues/4880 ).
2018-12-18 17:42:55 +00:00
7c4f67b1a1
v0.17.8
2018-12-10 13:46:57 +00:00
74c81d6921
v0.17.8-rc.1
2018-12-06 12:48:34 +00:00
02eb8a284c
Actually revert electron app version bump
...
last one was in fasct the main version file
2018-12-06 12:47:18 +00:00
6ba471421f
v0.17.8-rc.1
2018-12-06 11:20:33 +00:00
58f927538f
v0.17.7
2018-11-22 16:56:41 +00:00
07ed2e8d0a
v0.17.6
2018-11-19 15:23:08 +00:00
a4a6f070e4
v0.17.6-rc.2
2018-11-15 15:38:42 +00:00
154e8bdb50
v0.17.6-rc.1
2018-11-15 12:21:16 +00:00
cc4d0af713
Merge branch 'master' into develop
2018-11-13 19:02:34 +00:00
a1e5c72eb9
v0.17.5
2018-11-13 18:52:59 +00:00
061838bdab
Merge branch 'master' into develop
2018-11-13 18:19:10 +00:00
71403980cc
v0.17.4
2018-11-13 18:09:48 +00:00
409c48efcb
Merge branch 'master' into develop
2018-10-29 14:27:46 +00:00
4574415e97
v0.17.3
2018-10-29 14:20:59 +00:00
c80f5ddcd1
Correct the author of the electron app
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-10-27 11:04:05 +01:00
a9a45dc32b
v0.17.3-rc.1
2018-10-24 11:30:44 +01:00
221f75542a
v0.17.2
2018-10-19 16:51:26 +02:00
2518976326
v0.17.1
2018-10-18 18:38:54 +01:00
1fc8592ef6
v0.17.0
2018-10-16 10:59:18 +01:00
005e4aa1bd
Phased rollout of lazyloading
2018-10-16 10:43:15 +01:00
74f2266d89
v0.17.0-rc.1
2018-10-11 16:02:48 +01:00
957fde964b
v0.16.5
2018-10-01 16:48:52 +02:00
582b67c42e
v0.16.5-rc.1
2018-09-27 14:48:40 +01:00
44791a65b8
Revert "v0.16.5-rc.1"
...
This reverts commit 81dfe506ac
2018-09-27 14:46:42 +01:00
81dfe506ac
v0.16.5-rc.1
2018-09-27 14:42:14 +01:00
d8aaae6d42
v0.16.4
2018-09-10 11:42:20 +01:00
42bac1620e
v0.16.4-rc.1
2018-09-07 14:39:20 +01:00
c150d97eaf
v0.16.3
2018-09-03 14:29:48 +01:00
9e4aa50567
v0.16.3-rc.2
2018-08-31 13:50:57 +01:00
2bef30635c
v0.16.3-rc.1
2018-08-30 14:39:12 +01:00
656d0e0ff4
v0.16.2
2018-08-23 15:32:22 +01:00
2ba60a7893
v0.16.1
2018-08-20 13:58:47 +01:00
c46963807e
v0.16.1-rc.1
2018-08-16 15:46:28 +01:00
6e0aeeea83
v0.16.0
2018-07-30 12:14:55 +01:00
f248da3e08
v0.16.0-rc.2
2018-07-24 19:40:52 +01:00
ea00df0466
v0.16.0-rc.1
2018-07-24 18:33:53 +01:00
847df2f75b
v0.15.7
2018-07-09 13:19:14 +01:00
d7ebd88804
v0.15.7-rc.2
2018-07-06 15:59:20 +01:00
7e3cb3ba31
v0.15.7-rc.1
2018-07-04 11:27:21 +01:00
84fbee085d
v0.15.6
2018-06-29 12:01:17 +01:00
62653d39b3
v0.15.6-rc.2
2018-06-22 18:13:00 +01:00
f9868b6100
v0.15.6-rc.1
2018-06-21 10:18:45 +01:00
3847388ed0
Merge pull request #6805 from vector-im/t3chguy/electron_changes
...
[electron] Fix desktop app --hidden flag
2018-06-14 12:04:48 +01:00
ef341d4333
v0.15.5
2018-06-12 14:33:22 +01:00
e03248929d
v0.15.5-rc.1
2018-06-06 16:09:22 +01:00
e0bb6183a6
remove debug log
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-26 14:37:04 +01:00
20dd2c0b58
tidy code
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-26 14:36:25 +01:00
8a4a6b2023
refactor hidden logic to be more resilient against electron weirdness
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-26 14:21:38 +01:00
ca2533cafa
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-26 14:00:45 +01:00
07772ef5a2
v0.15.4
2018-05-25 15:23:18 +01:00
05e0e842d6
Add cookie policy URL to electron config
2018-05-25 10:00:44 +01:00
bd3eedbda9
v0.15.4-rc.1
2018-05-24 18:27:06 +01:00
581c95d093
Temporarily revert electron version bump
2018-05-24 18:26:43 +01:00
5f6b60370d
v0.15.4-rc.1
2018-05-24 18:24:59 +01:00
d5b21021fb
v0.15.3
2018-05-18 12:36:22 +01:00
4656d25590
Hide URL options for e2e blob: URL images
...
These won't work outside of the electron app so there is zero point
in trying to open them in an external browser or offerring to copy
them to the clipboard
2018-05-18 12:24:22 +01:00
d353c13bf1
Comment why we're passing empty objects in
2018-05-18 12:24:02 +01:00
8872a6a24a
Fix right click menu in electron
...
Fixes https://github.com/vector-im/riot-web/issues/6762
2018-05-18 12:23:56 +01:00
3598df0d28
v0.15.2
2018-05-17 17:07:50 +01:00
145fb69bdd
v0.15.1
2018-05-16 16:12:07 +01:00
6640e709f8
v0.15.0
2018-05-16 11:54:58 +01:00
f2bd4a4b5c
v0.15.0-rc.6
2018-05-15 18:06:44 +01:00
e9f0f84152
v0.15.0-rc.5
2018-05-15 15:59:02 +01:00
3987621b12
v0.15.0-rc.4
2018-05-14 18:29:49 +01:00
ebb08a57c8
v0.15.0-rc.3
2018-05-11 18:29:33 +01:00
6c5c3c3454
v0.15.0-rc.2
2018-05-09 17:37:48 +01:00
98c9dd23d5
v0.15.0-rc.1
2018-05-09 15:27:48 +01:00
371ea7c078
v0.14.3-rc.1
2018-05-09 13:50:45 +01:00
7f50fb3023
Merge branch 'master' into develop
2018-05-09 13:32:06 +01:00
dd7ae83226
No trailing /
2018-04-30 16:12:53 +01:00
48a16464d5
Don't show presence on matrix.org
2018-04-30 16:00:17 +01:00
9235c0dcfa
v0.14.2
2018-04-30 13:43:04 +01:00
6dad8e695e
v0.14.2-rc.3
2018-04-26 15:35:51 +01:00
73e4fcafdc
v0.14.2-rc.2
2018-04-26 11:44:36 +01:00
8b99a72f2c
v0.14.2-rc.1
2018-04-25 17:37:35 +01:00
083dd4eeec
Temporarily revert electron version bump
2018-04-25 16:36:16 +01:00
3dcf194960
v0.14.2-rc.1
2018-04-25 15:41:33 +01:00
7a2866feb9
v0.14.1
2018-04-12 12:59:27 +01:00
b2a0031fe1
v0.14.0
2018-04-11 11:57:33 +01:00
da988c85e4
v0.14.0-rc.6
2018-04-09 17:13:11 +01:00
233c3d2c98
v0.14.0-rc.5
2018-04-09 15:43:22 +01:00
0d64c5fb83
v0.14.0-rc.4
2018-03-22 13:27:32 +00:00
6bfb15ce7b
v0.14.0-rc.3
2018-03-20 17:40:36 +00:00
64c8f3dbe3
v0.14.0-rc.2
2018-03-19 15:01:14 +00:00
a662080ffe
v0.14.0-rc.1
2018-03-19 12:20:02 +00:00
1d222e3507
v0.13.5
2018-02-09 12:38:23 +00:00
2eb433157a
v0.13.4
2018-01-03 16:08:38 +00:00
d71af40967
add missing config.json entry such that scalar-staging widgets work
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-03 16:06:58 +00:00
5fba5b30e9
v0.13.3
2017-12-04 12:29:32 +00:00
854a665627
v0.13.2
2017-11-28 11:16:45 +00:00
6ebab2cb8d
v0.13.1
2017-11-17 16:05:26 +00:00
898bb6f9d8
v0.13.0
2017-11-15 11:08:37 +00:00
5e8ddc6d7c
v0.13.0-rc.3
2017-11-14 14:21:44 +00:00
ea0cfa92b4
v0.13.0-rc.2
2017-11-10 16:52:24 +00:00
0630d856f8
v0.13.0-rc.1
2017-11-10 13:44:08 +00:00
8716f93a6d
Disable labs in electron
...
as we now disable labs in release Riot
2017-10-16 15:22:17 +01:00
2ca0d6621c
v0.12.7
2017-10-16 14:55:33 +01:00
e0de9cbdfe
v0.12.7-rc.3
2017-10-13 16:36:07 +01:00
4bd53eb821
v0.12.7-rc.2
2017-10-13 15:05:34 +01:00
79154e26fc
v0.12.7-rc.1
2017-10-13 11:14:31 +01:00
af3feccc2d
v0.12.6
2017-09-21 21:50:48 +01:00
f450ce422e
v0.12.5
2017-09-21 18:06:03 +01:00
e814eb4555
v0.12.4
2017-09-20 15:18:17 +01:00
8a4710b270
v0.12.4-rc.1
2017-09-19 10:55:28 +01:00
d97224e69e
fix really dumb blunder/typo preventing system from going to sleep.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-19 00:53:44 +01:00
079f39efed
Add New Vector windows build signing cert
...
As the signing process needs it.
2017-09-11 17:04:10 +01:00
941f92530d
Merge pull request #4623 from MurzNN/patch-1
...
Fix menu on change keyboard language issue #4345
2017-09-07 16:01:04 +01:00
2ab9dc4270
v0.12.3
2017-09-06 13:31:31 +01:00
0ced816505
v0.12.3-rc.3
2017-09-05 13:42:47 +01:00
0c04df88cd
v0.12.3-rc.2
2017-09-05 13:14:33 +01:00
8b59c8c167
v0.12.3-rc.1
2017-09-01 16:21:38 +01:00
843b608939
v0.12.2
2017-08-24 14:51:11 +01:00
61d9c1a57a
Merge remote-tracking branch 'remotes/origin/develop' into patch-1
2017-08-24 10:07:04 +01:00
2cec34021a
v0.12.1
2017-08-23 15:58:05 +01:00
c7ddf6a80d
v0.12.1-rc.1
2017-08-22 18:56:13 +01:00
e5dd37d2d6
v0.12.0-rc.1
2017-08-16 10:39:57 +01:00
a6d5158830
electron support for mouse forward/back buttons in Windows
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-03 15:03:50 +01:00
c6bc20cd2a
Fix menu on change keyboard language issue #4345
...
Fix activating menu when changing keyboard language / layout via Alt-Shift, Alt-Ctrl, Alt-CapsLock, and Alt-Space
2017-07-18 09:23:32 +03:00
cc56ef3abd
Attempt to flush the rageshake logs on close
...
... so that we get to see what happened in the last 30s.
2017-06-22 18:25:19 +01:00
0788826a71
Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# electron_app/src/tray.js
2017-06-22 15:04:33 +01:00
8b65b96adf
Merge branch 'master' into develop
2017-06-22 12:08:14 +01:00
27d83ba440
v0.11.4
2017-06-22 12:01:05 +01:00
7d3f75ef87
Merge pull request #4355 from vector-im/t3chguy/electron/windows_icon_instability
...
explicit convert to nativeImage to stabilise trayIcon on Windows [Electron]
2017-06-21 15:04:36 +01:00
67a9b6502b
Merge branch 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff
2017-06-20 14:33:09 +01:00
fe1b0b5cd8
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff
2017-06-20 14:32:19 +01:00
499b1c2e70
add missing semicolon
2017-06-20 14:05:17 +01:00
eda3f20b26
v0.11.3
2017-06-20 13:13:28 +01:00
3e279746d5
v0.11.2
2017-06-19 13:19:09 +01:00
78068bfaa0
explicit convert to nativeImage to stabilise on Windows
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-19 11:58:44 +01:00
97611cfd27
v0.11.2-rc.2
2017-06-16 13:30:49 +01:00
e045b35c86
v0.11.2-rc.1
2017-06-15 17:20:22 +01:00
9325eef650
v0.11.1
2017-06-14 11:20:05 +01:00
b8e0cbaf5a
v0.11.0
2017-06-12 16:02:51 +01:00
b6d2ba2019
store window ref globally so when splitting files its easier to access.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-12 13:50:45 +01:00
deb7ed660c
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff
2017-06-11 23:13:49 +01:00
a520f0bfed
move all logic, make bar more generic
...
pass through actual errors
and tidy
needs testing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 19:19:17 +01:00
c4fd139586
get rid of pointless interval and timeout on linux
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 16:46:47 +01:00
4c8ff0955d
move electron update logic into own file, tidy tidy tidy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 16:44:36 +01:00
f335656c7d
v0.11.0-rc.2
2017-06-09 22:18:01 +01:00
b98497f386
v0.11.0-rc.1
2017-06-09 20:30:24 +01:00
968e21a67d
Merge branch 'master' into develop
2017-06-06 17:48:32 +01:00
951b63898b
v0.10.2
2017-06-06 17:43:57 +01:00
3d51156b7e
Temporarily revert
2017-06-06 17:43:34 +01:00
d648dc867e
v0.10.2
2017-06-06 17:41:57 +01:00
7b9ae0157a
Merge pull request #4183 from vector-im/t3chguy/electron_logo_windows_weirdness
...
to make the windows volume mixer not explode as it can't resize icons.
2017-06-04 22:58:17 +01:00
f24c6de245
provide react devtools in electron dev builds
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-04 15:30:44 +01:00
1e5a742602
this actually fixes things, still not happy with it, introduces more delay
...
(not noticeably more than the existing delay)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-04 14:27:19 +01:00
25a0af6ddb
to make the windows volume mixer not explode as it can't resize icons.
...
I hate Windows.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-04 11:05:28 +01:00
efc68c078e
basic manual update stuff + update check bar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:59:12 +01:00
a4526097ce
v0.10.1
2017-06-02 22:46:25 +01:00
4bbf950b3d
v0.10.0
2017-06-02 14:36:39 +01:00
774c410eda
v0.10.0-rc.2
2017-06-02 01:20:34 +01:00
3bab49ba86
v0.10.0-rc.1
2017-06-01 02:48:53 +01:00
21cf79bc54
Merge pull request #4030 from vector-im/t3chguy/electron_profiles
...
basic electron profile support
2017-06-01 01:33:01 +01:00
5762323bd1
Merge branch 'develop' into t3chguy/electron_profiles
2017-06-01 00:01:53 +01:00
33ee42f821
use loudNotification for flashFrame, resetting on count=0 or focus
...
win32 check is optional just there so we're not attaching pointless handlers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 00:00:00 +01:00
448c10736a
Merge pull request #4012 from vector-im/t3chguy/electron_settings
...
auto-launch support [Electron]
2017-05-30 23:59:15 +01:00
53b7b6cb14
Merge branch 't3chguy/electron_settings' of github.com:vector-im/riot-web into t3chguy/electron_settings
2017-05-30 12:34:05 +01:00
c54e2a30b6
explicitly hide because setApplicationMenu on Linux otherwise shows...
...
https://github.com/electron/electron/issues/9621
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 12:33:32 +01:00
db602f2bc0
Merge branch 'develop' into t3chguy/electron_profiles
2017-05-30 11:00:51 +01:00
b27600adbe
Improve for Mac - Tested on 10.10.5
2017-05-30 10:53:01 +01:00
9c25aab509
Fix bad merge (3993 before 4021 broke things)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 22:12:36 +01:00
1d2bd68200
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_settings
2017-05-29 22:12:06 +01:00
8a59acb5c3
explicit protocol in configs, otherwise breaks in Electron
...
when it tries file://
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:32:44 +01:00
28d929f901
correct electron config to not point at personal piwik
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:10:13 +01:00
c2c417b207
add piwik config to riot.im electron build config
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:07:56 +01:00
ff5adeff2c
Merge branch 'develop' into t3chguy/tidy_electron_files
2017-05-26 18:50:48 +01:00
445a55c7ca
Merge pull request #3992 from vector-im/t3chguy/electron_call_sleep
...
Prevent Power Save when in call (Electron)
2017-05-26 18:44:53 +01:00
e63baf62c4
quit -> exit as screen is not accessible in alt instance
...
when using makeSingleInstance
which leads to a weird error
Unhandled exception { Error: Cannot find module '../screen'
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-26 09:49:23 +01:00
0fb6a305a3
uber basic multi-profile support for electron app
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-26 09:48:32 +01:00
727e267853
we don't really need a webContents like that, so pass if needed
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-25 12:47:36 +01:00
c4c78c9b3e
split webContents context handling into own file, as main was growing
...
add handlers for editable fields, with Cut Copy Paste Undo Redo etc
add Copy Image feature to all images, working on not only the download
buttons now
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-25 12:42:53 +01:00
a98792b05e
auto-launch support, ux =checkbox in UserSettings[Electron]
...
settings are sorta generic, probably reusable for proxy settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-24 15:52:08 +01:00
c63e429c76
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_call_sleep
2017-05-24 10:56:36 +01:00
8994c2bad1
missed a concat :)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:28:01 +01:00
e0fb2fd074
/me forgets we don't have babel
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:25:56 +01:00
4bb054c955
electron stuff isn't actually using flow, so don't enable it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:25:18 +01:00
911c3bcf6e
tidy electron files, they were starting to annoy me
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:21:52 +01:00
4944bfdaa2
onAction support in Electron process, disable powersave when in call
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 18:32:39 +01:00
73ec3e1f4d
Merge branch 'master' into develop
2017-05-22 11:44:31 +01:00
J. Ryan Stinnett