René Pfeuffer 50d9da8726 Merge base branch into feature

2018-07-05 14:56:33 +02:00

..

conf

fix jetty-maven-plugin configuration

2014-10-17 21:47:54 +02:00

doc

fix conflict between rest- and apidocs

2017-05-10 09:37:31 +02:00

java/sonia/scm

Merge base branch into feature

2018-07-05 14:56:33 +02:00

resources

switch from jersey 1.x to resteasy

2017-06-27 20:16:05 +02:00

webapp

removed unnecessary json url extension

2017-06-28 22:01:11 +02:00