Johan Wikman f3973b331f Fix rebase error.

2018-05-18 16:00:05 +03:00

..

authenticator

Merge branch '2.2' into develop

2018-05-16 09:31:13 +03:00

filter

Merge branch '2.2' into develop

2018-05-14 11:24:09 +03:00

include

Update change date of 2.2

2017-06-01 10:24:20 +03:00

monitor

Fix rebase error.

2018-05-18 16:00:05 +03:00

protocol

Merge branch '2.2' into develop

2018-05-18 12:45:15 +03:00

routing

Merge branch '2.2' into develop

2018-05-18 12:45:15 +03:00

CMakeLists.txt

Fix devel package

2017-02-15 09:31:14 +02:00