f065643504
Add settings to disable TCP and TLS listeners explicitly
...
Fixes #100
2018-12-11 08:15:25 -08:00
1df1209a25
Close STOMP connection on termination
...
Fixes #102
2018-12-11 13:58:24 +01:00
818bfd73c7
Support more web_stomp.ssl.* options, including cipher suites
...
References rabbitmq/rabbitmq-server#1712 , rabbitmq/rabbitmq-server#1745 .
2018-12-11 03:27:52 +03:00
84ae992eae
New style config: support proxy protocol
2018-12-10 21:51:48 +03:00
078172af40
Update rabbitmq-components.mk
2018-12-06 18:29:12 +03:00
05f70821c8
Update rabbitmq-components.mk
2018-12-06 03:15:33 +03:00
89ab232908
Merge branch 'master' into rabbitmq-web-stomp-40
2018-12-05 21:04:23 +03:00
248280c61e
Add PROXY protocol support
2018-12-04 13:23:14 +01:00
baccff9ba8
Update rabbitmq-components.mk
2018-11-30 14:57:02 +01:00
447618a8a3
Update rabbitmq-components.mk
2018-11-22 09:19:46 +01:00
fbcf52b691
Implement credits flow
2018-11-20 11:08:36 +01:00
2780475000
Travis: use Elixir 1.6.6, test on Erlang 21.1
2018-11-15 12:03:37 +00:00
217290d553
Drive by cosmetic changes
2018-11-15 10:11:53 +00:00
5f8a0fd46a
Refactor Web-STOMP to be closer to Web-MQTT
...
This also discards a fair bit of unnecessary code that comes
from the old SockJS implementation, and reduces the number of
processes per connection by one.
2018-11-13 14:37:06 +01:00
231225ae55
Update rabbitmq-components.mk
2018-10-29 12:43:36 +00:00
7af141e546
Use 10 TLS connection acceptors by default
...
Part of rabbitmq/rabbitmq-server#1729.
[#161136615 ]
2018-10-11 03:11:43 +03:00
05022a01b1
formatting
2018-10-08 13:40:00 -07:00
4194e10d5c
Enable compression by default
...
References #89 , #90 .
[#161053760 ]
2018-10-08 21:44:19 +03:00
3a5d5b53c2
Handle unspecified ws_opts, references #89
2018-10-08 21:16:55 +03:00
3244059ffe
Supprot more web_stomp.ws_opts.* options
...
[#161053760 ]
2018-10-08 19:13:46 +03:00
b8b01e6fec
Basic tests for WebSocket options in config schema
...
References #89 , #90 .
2018-10-08 15:46:09 +03:00
1f3694b236
Keep Cowboy WebSocket options under web_stomp.ws_opts.*
...
Much like @yjh0502 originally suggested.
This way we can support other options that potentially overlap
with regular Cowboy options, e.g. idle_timeout.
References #89 , #90 , rabbitmq/rabbitmq-web-mqtt#34 .
2018-10-08 15:40:27 +03:00
540ae1c054
allow websocket compression extension
2018-10-08 18:21:40 +09:00
642bcdac06
Makefile: Add ranch to the `BUILD_DEPS`
...
This is to enforce the version of Ranch which is picked, because Cowboy
also depends on Ranch and might pull another version.
[#160270896 ]
2018-09-19 15:11:47 +02:00
a513f7bf8a
Update rabbitmq-components.mk
2018-09-19 10:38:28 +02:00
dbbb9fac5e
Update rabbitmq-components.mk
2018-09-11 14:22:45 +02:00
04cd1d363f
Make WebSocket endpoint configurable
...
Closes #86 , inspired by rabbitmq/rabbitmq-web-mqtt#30 .
2018-09-04 15:43:07 +02:00
9aee60f9de
Update rabbitmq-components.mk
2018-08-09 17:44:26 +02:00
bd86af9db9
Update rabbitmq-components.mk
2018-08-09 12:17:12 +02:00
30e9e063b6
Use rabbit_ws_handler as a regular module, not a parameterized one
...
Parameterized modules are removed in Erlang 21. There is a new compiler
option to emulate parameterized modules, but it's easy enough to change
the plugin to use regular module calling convention.
[#157964874 ]
2018-06-08 10:57:35 +02:00
7b1552d39a
Update rabbitmq-components.mk
2018-06-07 11:31:48 +02:00
db9ae80553
Update erlang.mk
2018-04-11 10:54:46 +02:00
e7eff82e11
Update rabbitmq-components.mk
2018-04-11 10:51:33 +02:00
e0ccaa36bb
Update rabbitmq-components.mk
2018-04-11 10:10:15 +02:00
3f9212e62d
Travis CI: Update config from rabbitmq-common
2018-04-10 13:10:12 +02:00
3c0c32cb2c
Remove an unused default key
...
The port key is not used as listener configuration goes
into tcp_config. Web MQTT doesn't have this key, for example.
2018-03-27 02:06:14 +03:00
54d937354a
Begin updating schema tests
2018-03-26 10:38:55 -07:00
8daa118f86
Update erlang.mk
2018-03-02 19:11:19 +01:00
d89518e22c
Update rabbitmq-components.mk
2018-01-30 15:24:04 +01:00
404bdc6a02
Update rabbitmq-components.mk
2018-01-29 16:22:29 -08:00
c86de50a81
Update rabbitmq-components.mk
2018-01-23 17:21:53 +01:00
063993b8e7
Update rabbitmq-components.mk
2018-01-23 15:31:40 +01:00
829a2d5960
Update rabbitmq-components.mk
2018-01-22 22:13:35 +00:00
0ee2674e24
Travis CI: Update config from rabbitmq-common
2017-12-15 15:18:38 +01:00
3ffee20107
Update rabbitmq-components.mk
2017-12-01 11:07:16 +01:00
de5beb3deb
Update rabbitmq-components.mk
2017-11-28 14:01:26 +01:00
334b26a73b
Update rabbitmq-components.mk
2017-11-28 13:33:32 +01:00
ba20be5307
Travis CI: Update config from rabbitmq-common
2017-11-08 12:30:35 +01:00
da1c0b247e
Support cowboy2. Drop support for SockJS.
...
STOMP processor uses socket, which is not retrievable from request
object.
We use custom protocol and middleware to transfer it to the
web stomp handler
Add tests for https connection.
2017-10-23 10:24:00 +01:00
84c4a09aff
Merge branch 'stable'
2017-10-13 15:14:54 +02:00
840cbda2d3
Update rabbitmq-components.mk
2017-10-13 14:33:20 +02:00
6b785cefff
Update rabbitmq-components.mk
2017-10-13 14:13:42 +02:00
8b5cdae53f
Update rabbitmq-components.mk
2017-10-13 12:15:56 +02:00
10ed01efbd
Update rabbitmq-components.mk
2017-09-13 17:54:56 -04:00
f7bc44864e
Update rabbitmq-components.mk
2017-09-13 17:45:52 -04:00
4920a5bf2d
Update rabbitmq-components.mk
2017-09-12 19:53:47 -04:00
7ac654a753
Update rabbitmq-components.mk
2017-09-12 12:42:11 -04:00
186b608951
Merge branch 'stable'
2017-08-30 19:20:55 +01:00
7db37e319a
Update erlang.mk
2017-08-30 18:46:45 +01:00
c91cbc52d1
Use connection sink for logs.
...
SockJS logs should go to `connection` sink.
[#149634975 ]
2017-08-07 14:48:55 +01:00
82ba9038d8
Erlang/OTP 19.2 is now the minimum supported version.
...
Part of rabbitmq/rabbitmq-server#1305.
[#149563549 ]
2017-07-26 19:03:39 +03:00
11d680a46a
Update rabbitmq-components.mk
2017-07-26 03:48:46 +03:00
ae91e1aa17
Update rabbitmq-components.mk
2017-07-26 02:27:21 +03:00
1e9dbfbe89
Update rabbitmq-components.mk
2017-06-12 20:19:16 +03:00
252594042b
Update rabbitmq-components.mk
2017-06-12 18:35:53 +03:00
f4f67171cd
Merge branch 'stable'
2017-06-10 09:29:15 +03:00
06fff7c4f8
Add passing tests for stomp->stomp messaging with headers, AMQP test not running correctly yet
...
fix up test that does an AMQP -> web stomp publish. No headers received
Build AMQP header tuples correctly
2017-06-09 11:09:30 -07:00
3a0cc6efc8
Merge branch 'stable'
2017-06-02 18:12:27 +03:00
a6f11fb458
Update rabbitmq-components.mk
2017-06-02 17:51:40 +03:00
da34b49667
Update rabbitmq-components.mk
2017-06-02 00:43:37 +03:00
a660b95f64
Update rabbitmq-components.mk
2017-06-01 18:01:57 +03:00
760b204738
Merge branch 'stable'
2017-05-31 11:05:38 +02:00
4715c4dd6e
*_SUITE: Replace crypto:rand_bytes/1 by crypto:strong_rand_bytes/1
...
The former is deprecated for some time and is entirely removed in Erlang
20.0. This obviously causes the testsuite to fail with this version of
Erlang (or more exactly, it hangs because the `undef` exception is
missed).
crypto:strong_rand_bytes/1 is already available in Erlang R16B03 so we
can use it directly. No need for a compat module.
[#145213041 ]
2017-05-31 10:59:13 +02:00
b9b1a8408d
Merge branch 'stable'
2017-05-16 18:14:14 +02:00
795e756e11
Makefile: Load the new `rabbitmq-early-plugin.mk` early-stage plugin
...
See the corresponding commit in rabbitmq-common for an explanation.
[#144697185 ]
2017-05-16 17:40:11 +02:00
118e15fd34
Update erlang.mk
2017-05-16 17:40:11 +02:00
86c99ff16a
Merge branch 'stable'
2017-05-03 12:37:09 +02:00
731e15938e
rabbit_stomp_processor:cancel_consumer/3 returns a triplet
...
Part of #75 .
[#144738809 ]
2017-05-03 00:00:19 +02:00
8a41841fe2
Merge branch 'stable'
2017-04-19 16:24:34 +02:00
2f7b0f6220
Update erlang.mk
2017-04-19 12:06:37 +02:00
b8fea9e614
Merge branch 'stable'
2017-04-06 21:41:26 +02:00
0a5e084fff
Do not emit stats if connection has not been stablished
...
Stats should not be emitted until the connection is stablished - that is,
the initial value 'none' is overridden. A non-pid value crashes the stats gc.
rabbitmq-management-agent#42
2017-04-06 12:11:07 +01:00
9d0d2b4904
Merge branch 'stable'
2017-04-03 16:40:13 +03:00
0f2f544d3e
Use correct order of arguments here
2017-04-03 16:33:29 +03:00
455e6b9613
Merge branch 'stable'
2017-04-03 16:32:04 +03:00
574f760917
Handle the case where Cowboy HTTP listener is already started.
...
Fixes #72 (or at least works around it).
2017-04-03 14:56:20 +03:00
af6a29d465
Merge branch 'stable'
2017-04-02 22:04:58 +03:00
458007ec03
(c) year
2017-04-02 21:50:11 +03:00
37755d8685
Update rabbitmq-components.mk
2017-03-20 18:10:27 +01:00
eb2fc09a9f
Update rabbitmq-components.mk
2017-03-20 18:04:56 +01:00
5edd1143db
Ignore test/config_schema_SUITE_data/schema/
2017-03-20 19:18:25 +03:00
b18ade4d8a
Sync README with master
2017-03-20 16:19:13 +03:00
ff074d38f7
Update README.md
...
Conflicts:
README.md
2017-03-20 16:18:57 +03:00
4de92d0681
Update README.md
2017-03-20 16:16:01 +03:00
dd31979f57
Config schema test for plugin
...
Part of [#141481501 ]
Moved from rabbitmq-server
2017-03-17 11:02:44 +00:00
55fd298b57
Merge branch 'stable'
2017-03-11 01:43:41 +03:00
e40a440def
Cosmetics
2017-03-11 01:16:33 +03:00
350bde6180
Support typical RabbitMQ TCP socket options
...
The port option in the tcp_options entry takes now precedence
explicitly over the port option at the root of the env proplist.
It was previously the case, even if the opposite was advertized:
there would be 2 port entries in the Ranch options and Ranch
would take the one from tcp_options.
It's now possible to use strings for IP addresses, not only tuples.
The correct binding address and port are now used in the log message.
Fixes #69
2017-03-10 13:35:09 +01:00
a1db906a41
Update rabbitmq-components.mk
2017-02-11 23:29:47 +03:00
512c3c66c5
Update rabbitmq-components.mk
2017-02-10 11:16:48 +03:00
1616bab61f
Update rabbitmq-components.mk
2017-02-10 03:06:42 +03:00
b95f636dbe
merge branch 'stable'
2017-02-08 16:59:10 +03:00
a232431eda
Update rabbitmq-components.mk
2017-02-08 16:38:28 +03:00
f01f670b0f
merge branch 'stable'
2017-02-06 19:52:42 +03:00
bb2d41fb43
Update rabbitmq-components.mk
2017-02-06 19:24:06 +03:00
e8b3937e3e
Update rabbitmq-components.mk
2017-02-02 17:17:28 +01:00
c27ddc07e6
merge branch 'stable'
2017-01-31 18:20:40 +03:00
cb733d9dbb
Update rabbitmq-components.mk
2017-01-31 18:06:41 +03:00
9de6705fbd
Makefile: Remove Cowboy version pinning
...
There is a global pinning in rabbitmq-components.mk.
2017-01-25 17:03:59 +01:00
cbcd057e42
Merge branch 'stable'
...
Conflicts:
.travis.yml
2016-12-17 02:56:29 +03:00
df0223c03f
Test against 18.3, 19.1 and 19.2 on Travis
2016-12-17 02:48:28 +03:00
d5daa5d349
Travis CI: Import changes from rabbitmq-auth-backend-amqp
2016-12-12 15:22:17 +01:00
b5e952ddb0
Merge branch 'stable'
2016-12-09 19:28:23 +01:00
8412dbc38b
Update rabbitmq-components.mk
2016-12-08 19:14:55 +01:00
1ac1bd0e5d
Travis CI: Use Ubuntu Trusty image to have access to Elixir
...
Also, required `sudo` so a VM is used instead of a container. This makes
the test much longer, but allows us to install non-whitelisted packages
such as xsltproc.
2016-12-08 17:55:07 +01:00
fb3db61ceb
Merge branch 'stable'
2016-12-08 12:54:23 +01:00
5b141a10cb
rabbit_ws_sockjs: Fix listeners registration
...
... when a listener is bound to multiple IP addresses.
This is the case when a listener is configured to listen on all
interfaces, and IPv4's `0.0.0.0` and IPv6's `::` are reported
separately. It happens on *BSD and Linux with `net.ipv6.bindv6only=1` at
least.
[#135770181 ]
2016-12-08 12:45:07 +01:00
5b9d566207
Merge branch 'stable'
2016-12-07 16:08:15 +01:00
85b3f64c2b
Merge pull request #67 from rabbitmq/rabbitmq-web-stomp-60
...
Fix use of default credentials with use_http_auth
2016-12-06 21:04:38 +03:00
186004ae47
Fix use of default credentials with use_http_auth
...
When HTTP authorization header is not sent, we use the default
credentials defined in the rabbitmq_stomp configuration.
2016-12-06 17:33:48 +01:00
56e670b26b
Move from .app.src to Makefile variables
...
This is the recommended way with Erlang.mk.
By default, the version is inherited from rabbitmq-server-release when
the source archive is created, or computed from git-describe(1) (see
`rabbitmq-components.mk`). One can override the version from the command
line by setting the `PROJECT_VERSION` variable.
[#130992027 ]
2016-12-06 17:09:26 +01:00
622c9b3404
Merge branch 'stable'
2016-12-06 17:48:06 +03:00
dcd75370a6
Register listeners to management UI
2016-12-06 15:16:04 +01:00
17d9556ff5
Merge branch 'stable'
2016-12-01 14:19:05 +03:00
274ffe231a
Merge branch 'stable'
2016-11-30 18:58:43 +03:00
eea6404a5e
Merge branch 'stable'
2016-11-29 21:22:22 +03:00
a7190cc9e5
Update rabbitmq-components.mk
2016-11-29 20:59:45 +03:00
25d783e4f1
Merge branch 'stable'
2016-11-25 11:51:27 +01:00
50b57847c5
Update rabbitmq-components.mk
2016-11-25 10:51:05 +01:00
f5115dd59e
Merge branch 'stable'
2016-11-25 10:40:17 +01:00
574b4e3f71
Update rabbitmq-components.mk
2016-11-25 10:08:26 +01:00
0cc5732204
Merge branch 'stable' into rabbitmq-management-236
2016-11-24 12:13:48 +01:00
41b069c0b2
Merge branch 'stable'
2016-11-24 10:53:37 +01:00
dd9b8c8012
Add rabbitmq_ct_client_helpers to TEST_DEPS
2016-11-24 10:53:30 +01:00
2b90f8b0e7
Update rabbitmq-components.mk
2016-11-23 18:06:10 +01:00
c31b9b4385
Merge branch 'stable'
2016-11-22 17:05:29 +00:00
03d9194ed4
Update erlang.mk
2016-11-22 16:21:00 +00:00
ee4301eabb
Update rabbitmq-components.mk
2016-11-22 16:16:47 +00:00
8841defc93
Update erlang.mk
2016-11-14 11:59:58 +01:00
3353b84f65
Update rabbitmq-components.mk
2016-11-10 16:57:00 +01:00
3331c48ca7
Merge branch 'stable' into rabbitmq-management-236
2016-09-27 12:49:01 +02:00
c379c72bb7
Makefile: No need to patch SockJS anymore
...
We had to do that temporarily to pass `-Duse_old_builtin_types` to
SockJS' Makefile.
[#130659985 ]
2016-09-26 11:49:37 +02:00
af0c9f6db0
Merge branch 'stable'
2016-09-26 11:49:20 +02:00
7baa7af7bb
Makefile: No need to depend on `ranch` now
...
The plugin depends on rabbitmq-server which pulls the correct version of
Ranch.
[#130659985 ]
2016-09-26 11:45:30 +02:00
ff480d3210
Merge branch 'stable'
2016-09-23 16:33:49 +02:00
fb38fe4475
Makefile: Add missing rabbitmq_ct_helpers to TEST_DEPS
...
[#130086871 ]
2016-09-23 15:02:50 +02:00
d16af7da6a
Update rabbitmq-components.mk
2016-09-23 11:23:12 +02:00
5de97706d9
Update erlang.mk
2016-09-22 17:57:27 +02:00
2012506286
rabbitmq_web_stomp.app: Depend on rabbit_common
2016-09-20 13:16:59 +02:00
80cfe0ebf8
Makefile: Explicitely list all DEPS
...
Sync rabbitmq-components.mk with rabbitmq-common to remove automatic
DEPS handling.
[#130086871 ]
2016-09-20 13:16:13 +02:00
880d355e5f
Update erlang.mk
2016-09-20 13:15:16 +02:00
ac476df151
Merge branch 'stable'
2016-09-15 16:44:12 +02:00
ee64a20c3e
Update rabbitmq-components.mk
2016-09-15 15:47:27 +02:00
8c4fdcf21a
Merge branch 'stable'
2016-09-05 16:37:47 +02:00
4a20f21f26
rfc6455_client: Remove dead code
2016-09-05 16:13:07 +02:00
eca021fdd8
*_websocket_SUITE: Stop the broker at the end of the testsuite
2016-09-05 16:13:06 +02:00
2da74e4f1d
Do not force default `default_user` when falling back to non-HTTP auth
...
If the Authorization HTTP header is missing, we want to fallback to
the credentials in the CONNECT frame. Therefore, we must not force the
default `default_user` credentials in the `#stomp_configuration{}`
record.
This problem went unnoticed before and the authentication always failed
because the default `default_user` was made of Erlang strings instead
of binaries, which was rejected by the Erlang client and RabbitMQ. This
problem was fixed in commit a49e814e70e2ee839d282b9614cf8bfbab87acb8 in
rabbitmq-comp.
While here, remove trailing whitespaces.
2016-09-05 16:08:33 +02:00
5b091c91a7
Makefile: Add lager to BUILD_DEPS
...
It is indirectly needed by sockjs because we build it with ERLC_OPTS
which uses Lager's parse_transform.
2016-09-05 16:01:19 +02:00
be163bc078
Merge branch 'stable'
2016-09-02 16:12:46 +02:00
ed812d43ce
Travis CI: Import checkout fixes from rabbitmq-stomp
2016-09-02 15:13:37 +02:00
85a01af27e
Travis CI: Test against Erlang 19.0
2016-09-02 15:12:55 +02:00
3870ecdb0e
Travis CI: Do not test against Erlang R16B03
...
sockjs (a dependency) fails to build with Erlang R16B03.
2016-09-02 15:12:06 +02:00
c8c128b4f1
Update rabbitmq-components.mk
2016-09-02 13:22:28 +02:00
d182c90572
Makefile: No need to filter out rabbitmq_test from TEST_DEPS anymore
...
[#127356157 ]
2016-09-02 12:37:07 +02:00
34ec43b409
Update rabbitmq-components.mk
2016-09-02 12:03:34 +02:00
5e6908fd69
Merge branch 'stable'
2016-09-01 18:08:12 +01:00
d7cd45fdaf
Ignore sockjs heartbeats
2016-09-01 18:07:54 +01:00
2651c3f50c
write connection_stats metrics
2016-09-01 13:57:13 +01:00
db03352522
Change order of dependencies to compile lager_transform correctly
2016-08-30 15:30:52 +01:00
6d1760dc8d
Merge branch 'stable'
2016-07-28 15:12:42 +01:00
6e93763d6b
Filter out rabbitmq_test
...
like we do in other recently ported projects
2016-07-26 03:24:30 +03:00
55f5a48e45
Run tests with Common Test instead of EUnit
2016-07-26 02:55:22 +03:00
27e9e58923
Move to common test
2016-07-22 13:58:55 +01:00
1529cb4959
Merge branch 'stable'
2016-07-20 12:04:18 +02:00
ff8504296d
Makefile: Re-use RMQ_ERLC_OPTS instead of checking Erlang version again
2016-07-20 12:01:44 +02:00
e00e82ac25
Update rabbitmq-components.mk
2016-07-14 15:44:15 +03:00
af3915cdee
Update rabbitmq-components.mk
2016-07-14 15:37:38 +03:00
de687fca9e
Update rabbitmq-components.mk
2016-07-14 13:48:21 +03:00
7f38e3e980
Update rabbitmq-components.mk
2016-07-14 13:20:06 +03:00
8c67d8a81d
Update README.md
2016-06-21 02:43:24 +03:00
8a87c817f8
Merge branch 'stable'
2016-06-17 14:18:11 +01:00
e017b6df2c
Set bounded timeout for OTP workers
2016-06-16 13:12:03 +01:00
e4ad53fd4f
Merge branch 'stable'
2016-05-29 23:37:23 +03:00
d40cc2a51a
Update rabbitmq-components.mk
2016-05-29 23:21:57 +03:00
40bb561b60
Update CONTRIBUTING.md, add CODE_OF_CONDUCT.md
2016-05-28 09:57:34 -07:00
91e528a687
Update CONTRIBUTING.md, add CODE_OF_CONDUCT.md
2016-05-28 14:22:52 +03:00
14c1144527
Merge branch 'stable'
2016-05-18 13:22:07 +01:00
3ad14dcc18
Update rabbitmq-components.mk
2016-05-18 12:48:03 +01:00
2f91461fa6
Merge pull request #61 from rabbitmq/rabbitmq-server-546
...
Use erlang 18.3 only in travis
2016-05-17 12:06:14 +03:00
37f7960873
Update rabbitmq-components.mk
2016-05-17 11:17:55 +03:00
351fead874
Update rabbitmq-components.mk
2016-05-17 10:16:11 +03:00
842665c3d9
Use erlang 18.3 only in travis
2016-05-12 10:58:25 +01:00
e2e937941c
Stub for broker_version_requirements
2016-04-22 14:42:18 +01:00
ac633b0de0
Merge branch 'stable'
2016-03-31 12:07:56 +03:00
2e02098576
Properly handle the Websocket protocol header
...
We support v10.stomp, v11.stomp and v12.stomp at the moment.
The better one will be selected if a client advertises two
or more.
2016-03-30 18:57:26 +02:00
9b41ef8996
Merge branch 'stable'
2016-03-30 01:49:52 +03:00
6bbafbd581
Merge branch 'stable' into rabbitmq-web-stomp-43
2016-03-30 01:36:35 +03:00
a9f3620769
Add use_http_auth option to enable HTTP Basic Auth
...
The intended behavior is to use the login/passcode found
in the Authorization header, if any, and otherwise fall
back to the usual authentication methods.
2016-03-25 13:11:46 +01:00
f570a52b75
Merge pull request #52 from rabbitmq/rabbitmq-server-550
...
Cuttlefish schema
2016-03-24 00:29:33 +03:00
816a62864e
Merge branch 'stable'
2016-03-23 17:21:07 +03:00
Luke Bakken
Arnaud Cogoluègnes
Michael Klishin
Loïc Hoguin
Jean-Sébastien Pédron
kjnilsson
Michael Klishin
Jihyun Yu
Jean-Sébastien Pédron
Diana Corbacho
Daniil Fedotov
Michael Klishin
Gerhard Lazu
kjnilsson
Karl Nilsson