libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6
8871 commits 4 branches 5 tags 480 MiB
Commit graph

651 commits

Author SHA1 Message Date
Stian Thorgersen
59c7cfcc97 KEYCLOAK-2312 Move client-registration libs into integration 2016-01-21 09:06:23 +01:00
Bill Burke
d9487a8745 social broker reorg 2016-01-20 16:46:38 -05:00
Stian Thorgersen
73db7a0ea9 KEYCLOAK-2323 Revert changes 2016-01-20 14:34:59 +01:00
Stian Thorgersen
ded919c0a6 Merge pull request #2033 from ahus1/ahus1_location_fragment_lost_on_logout 
Handle URL fragments when redirect from logout / KEYCLOAK-2323
 2016-01-18 09:52:37 +01:00
Stian Thorgersen
504218470b Merge pull request #2032 from ahus1/ahus1_timeskew_for_init 
set timeSkew when passing tokens to init()
 2016-01-15 16:38:38 +01:00
Alexander Schwartz
b7ac2548f1 Handle URL fragments when redirect from logout / KEYCLOAK-2323 2016-01-14 23:06:16 +01:00
Alexander Schwartz
9b8c80e83f set timeSkew when passing tokens to init(), also allow timeSkew to be passed as a parameter / KEYCLOAK-2322 2016-01-14 22:37:29 +01:00
Stian Thorgersen
435980d776 KEYCLOAK-1809 
Upgrade jackson to version 2.x
 2016-01-14 16:34:30 +01:00
Stian Thorgersen
ddb41e2c58 Merge pull request #2017 from mposolda/master 
KEYCLOAK-2270 Use sub instead of iss for clientId in JWTClientAuthent…
 2016-01-13 11:10:09 +01:00
mposolda
4642876323 KEYCLOAK-2270 Use sub instead of iss for clientId in JWTClientAuthenticator 2016-01-13 10:12:20 +01:00
Stian Thorgersen
0193c696ab Version bump 2016-01-13 09:20:38 +01:00
Bill Burke
f7ac5fae2a Merge pull request #1945 from raehalme/KEYCLOAK-1579 
KEYCLOAK-1579: Replaced AdapterDeploymentContextBean with AdapterDeploymentContextFactoryBean
 2016-01-04 17:15:25 -05:00
Bill Burke
d939b6a431 template scope 2015-12-18 17:15:27 -05:00
Thomas Raehalme
566a58b5d8 Replaced AdapterDeploymentContextBean with AdapterDeploymentContextFactoryBean and added support for KeycloakConfigResolver. 2015-12-15 11:53:10 +02:00
Bill Burke
96e1813b34 client templates backend 2015-12-11 10:31:42 -05:00
Stian Thorgersen
34c3ffaae1 Ported AdminApiTest to use admin client 2015-12-03 08:24:23 +01:00
Stian Thorgersen
ff806eae08 Version bump 2015-12-01 19:54:28 +01:00
Stian Thorgersen
2c5510284d Merge pull request #1891 from mstruk/wildfly-modules-rename 
KEYCLOAK-2099 WildFly 10 adapter subsystem
 2015-11-30 09:48:15 +01:00
mposolda
57b60797ce KEYCLOAK-1129 Implicit flow: more work 2015-11-28 00:15:41 +01:00
mposolda
ef80b64d1c KEYCLOAK-1129 Implicit flow and Hybrid flow support 2015-11-27 22:28:38 +01:00
Marko Strukelj
373fc23fc0 KEYCLOAK-2099 WildFly 10 adapter subsystem 2015-11-27 20:46:20 +01:00
Stian Thorgersen
c83e3bd2d1 KEYCLOAK-2106 HTTP 500 for unparsable refresh tokens 2015-11-27 08:59:23 +01:00
Bill Burke
d6e2bccb16 Merge pull request #1840 from velias/KEYCLOAK-2075 
KEYCLOAK-2075 KEYCLOAK-2107 - support for SAML IsPassive mode
 2015-11-25 10:35:00 -05:00
Bill Burke
0c8f3f734d Merge pull request #1855 from Smartling/KEYCLOAK-1391 
KEYCLOAK-1391: Return an HTTP 401 for API requests
 2015-11-25 08:57:05 -05:00
Vlastimil Elias
e3060e5e58 rebased to latest master 2015-11-25 13:46:29 +01:00
Vlastimil Elias
18fa03bf97 KEYCLOAK-2107 - support IsPassive mode in SAML SP adapter library 
KEYCLOAK-2075 - added integration tests for both server and adapter side
 2015-11-25 08:39:55 +01:00
Stian Thorgersen
3685a185d4 Merge pull request #1859 from stianst/reset-pass 
KEYCLOAK-1758 add-user script
 2015-11-25 06:56:35 +01:00
Bill Burke
ff63c5552a sendError() handling' 2015-11-24 16:48:24 -05:00
Stian Thorgersen
cfc28b861b KEYCLOAK-1758 add-user script 2015-11-24 21:54:58 +01:00
Scott Rossillo
f1c3295cec KEYCLOAK-1391: Return an HTTP 401 for API requests 
Non browser HTTP requests shouldn't redirect to the Keycloak login
page. Instead, return an HTTP 401 with a proper WWW-Authenticate
header.
 2015-11-23 10:46:14 -05:00
Bill Burke
ac1baa059f Merge pull request #1797 from raehalme/KEYCLOAK-2041 
KEYCLOAK-2041 Use sendError instead of setStatus to report errors
 2015-11-20 11:50:37 -05:00
Bill Burke
98958a2bc4 default groups 2015-11-18 19:40:30 -05:00
Bill Burke
6989589e72 Merge remote-tracking branch 'upstream/master' 2015-11-18 15:24:45 -05:00
Bill Burke
41331111da resolve conflicts 2015-11-18 09:39:19 -05:00
Bill Burke
bff334d365 group token/assertion and tests 2015-11-18 09:36:47 -05:00
Stian Thorgersen
764c20d748 KEYCLOAK-2085 Initial access tokens for client registration 2015-11-18 10:33:24 +01:00
Stian Thorgersen
1df741a307 Merge pull request #1826 from lkubik/changeAllJettyToProvided 
KEYCLOAK-2081
 2015-11-16 20:23:31 +01:00
Lukas Kubik
13a52c1bb2 KEYCLOAK-2081 
Change scope of jetty dependencies to provided
 2015-11-13 15:43:11 +01:00
Thomas Darimont
c4416a25e0 KEYCLOAK-2068 - Fix Potential NPE when using Servlet-Filter Adapter. 
When using the `org.keycloak.adapters.servlet.KeycloakOIDCFilter` a `NullPointerException`
can be thrown in the `org.keycloak.adapters.servlet.FilterSessionStore` within the `getParam`
method of the generated wrapper in `buildWrapper` when the `content-type` is not set.
Since the `content-type` is only used to parse the body. We just check whether the `body`
is `null` and if so avoid touching the `content-type` which prevents the NPE.

If the `body` is null we return an empty `MultivaluedHashMap` for the parameters.
 2015-11-13 00:14:34 +01:00
Bruno Oliveira
9203971809 KEYCLOAK-2064: Update pax-web to make use of SecureRandom 2015-11-12 09:46:45 -02:00
Stian Thorgersen
64baa28301 Merge pull request #1810 from lkubik/updateJettyScope 
Change scope of jetty dependencies in jetty-adapter-spi
 2015-11-12 09:23:44 +01:00
Stian Thorgersen
1891019067 Merge pull request #1802 from equinux/pr/fix-js-parameter-encoding 
Fix parameter encoding in JS adapter
 2015-11-12 09:19:21 +01:00
Bill Burke
33ac048c8c resolve conflicts 2015-11-11 18:06:39 -05:00
Lukas Kubik
825a68c6c9 Change scope of jetty dependencies in jetty-adapter-spi. 2015-11-11 17:01:46 +01:00
Lukas Kubik
1f75f85a20 Unify jetty version in keycloak-jetty-adapter-spi with other versions 2015-11-11 13:58:22 +01:00
Dominique d'Argent
7ef747e7c4 Fix parameter encoding in JS adapter 
- fixes https://issues.jboss.org/browse/KEYCLOAK-2047
- relates to keycloak/keycloak-js-bower#7
 2015-11-10 11:20:06 +01:00
Thomas Raehalme
68edf9ce48 Errors are now reported using sendError instead of setStatus. 
This change was made to enable the use of error pages defined in web.xml.
 2015-11-06 10:53:18 +02:00
Thomas Raehalme
7b7fbd3257 Added sendError(int) to HttpFacade.Response. 2015-11-06 10:47:08 +02:00
Bill Burke
151c56a304 conflicts 2015-11-02 11:21:10 -05:00
Bill Burke
d896800ec6 groups initial 2015-10-29 16:33:02 -04:00
agolPl
9755d79879 extract keycloak configuration file name 2015-10-25 00:26:18 +02:00
Ramiro Sánchez
ebd02a1a7f Changed query parameter from kc_locale to ui_locales as suggested by stianst 2015-10-23 14:21:59 +02:00
Ramiro Sánchez
a5dc91f9a6 Added support to indicate desired locale on login 2015-10-23 12:23:24 +02:00
Stian Thorgersen
3f8312427a Version bump 2015-10-19 16:15:29 +02:00
mposolda
4587fd23b6 KEYCLOAK-1929 Change package names. Fix Fuse demo 2015-10-16 16:30:42 +02:00
Bill Burke
235ffb2ff6 KEYCLOAK-1960 2015-10-15 18:56:56 -04:00
Bill Burke
181fdeb0d0 KEYCLOAK-1960 2015-10-15 18:54:57 -04:00
Bill Burke
0ad29c9737 node registration 2015-10-09 18:11:38 -04:00
Bill Burke
9ced56d8d7 saml and oidc filters 2015-10-09 18:07:50 -04:00
Bill Burke
d39aee0a72 Merge remote-tracking branch 'upstream/master' 2015-10-08 16:19:56 -04:00
Bill Burke
7c600e2f4b SAML SP Filter 2015-10-08 16:19:43 -04:00
Stian Thorgersen
7fec1677ee Merge pull request #1679 from lkrzyzanek/KEYCLOAK-1904 
Add 'register' and 'createRegisterUrl' methods to Javascript Adapter API
 2015-10-08 11:51:18 +02:00
Libor Krzyzanek
f29aff4bed Add 'register' and 'createRegisterUrl' methods to Javascript Adapter API. fixes #KEYCLOAK-1904 2015-10-07 13:53:25 +02:00
Stian Thorgersen
9c0c8e37b6 Merge pull request #1676 from Smartling/KEYCLOAK-1901 
KEYCLOAK-1901: Add a Keycloak client builder
 2015-10-07 09:06:19 +02:00
Stian Thorgersen
7a3b4823b0 Merge pull request #1662 from Smartling/KEYCLOAK-1892 
WrappedHttpServletRequest may throw an exception returning cookies
 2015-10-06 14:58:54 +02:00
Scott Rossillo
332e3f6099 KEYCLOAK-1901: Add a Keycloak client builder 
Adds support for creating a Keycloak client using the builder
pattern and supports customizing the underlying ResteasyClient
used for connecting to the Keycloak server.
 2015-10-05 14:56:38 -04:00
mposolda
7816f053a6 KEYCLOAK-1856 KEYCLOAK-1860 Fix onoffswitchvalue directive 2015-10-02 11:09:54 +02:00
Bill Burke
75343986b0 keycloak-common 2015-10-01 14:27:51 -04:00
Scott Rossillo
05bd51ac1c WrappedHttpServletRequest may throw an exception returning cookies 
HttpServletRequest.getCookies() may return null
 2015-09-30 14:31:15 -04:00
Stian Thorgersen
55deedd3b8 KEYCLOAK-1868 Import clients through admin console 
KEYCLOAK-1869 Add root url to clients that should be used to resolve relative urls
 2015-09-29 12:16:05 +02:00
Bill Burke
0a42a28eeb Merge remote-tracking branch 'upstream/master' 2015-09-25 15:12:34 -04:00
Bill Burke
88355d7eb4 tomcat6 adapter 2015-09-25 15:12:14 -04:00
Stian Thorgersen
75c0d5089f KEYCLOAK-1878 
Add Base64 to Keycloak core
 2015-09-25 07:02:25 +02:00
Bill Burke
791a740f32 Merge remote-tracking branch 'upstream/master' 2015-09-24 12:05:24 -04:00
Bill Burke
546cdd7d8f fix modules for refactor 2015-09-24 12:05:12 -04:00
Stian Thorgersen
4eaf893492 Merge pull request #1610 from raehalme/KEYCLOAK-1828 
KEYCLOAK-1828 attemptAuthentication throws KeycloakAuthenticationException if authentication fails
 2015-09-24 06:32:27 +02:00
Stian Thorgersen
0ba6ab198a Merge pull request #1611 from raehalme/KEYCLOAK-1829 
KEYCLOAK-1829 unsuccessfulAuthentication now returns HTTP response status 401 instead of 403
 2015-09-24 06:31:33 +02:00
Bill Burke
c14d3d7963 merge conflicts 2015-09-23 21:01:47 -04:00
Bill Burke
1e9c09d23a more complete 2015-09-23 17:54:16 -04:00
mposolda
7ec3f86efb KEYCLOAK-904 Offline tokens 2015-09-21 10:28:30 +02:00
mposolda
c11539cccb docs and javadoc fixes 2015-09-21 10:13:41 +02:00
Bill Burke
861a13501a merge 2015-09-17 14:25:16 -04:00
Bill Burke
0f24bd2ea4 merge 2015-09-17 14:06:33 -04:00
Bill Burke
cb8ca619ae saml sp 2015-09-17 14:00:57 -04:00
Tomas Kyjovsky
ac91deac96 Removed occurences of serialVersionUID from all classes. 2015-09-17 17:27:39 +02:00
Lukas Kubik
b7e49dc88d Unify jetty 8.1 artifacts version with fabric8-bom-1.2.0.redhat-133.pom 2015-09-16 17:14:29 +02:00
Stian Thorgersen
85df0b6a67 Merge pull request #1613 from raehalme/KEYCLOAK-1832 
KEYCLOAK-1832 Added check for null authentication on the logout method
 2015-09-16 13:34:51 +02:00
Thomas Raehalme
e0eac89e5a Added check for null authentication on the logout method. 2015-09-10 12:30:07 +03:00
Thomas Raehalme
90d34bfd06 unsuccessfulAuthentication now returns HTTP response status 401 instead of 403. 2015-09-09 18:31:25 +03:00
Thomas Raehalme
e58b5762f3 attemptAuthentication now throws KeycloakAuthenticationException if authentication fails. 
Also authenticationFailureHandler is by default set to SimpleUrlAuthenticationFailureHandler
with default login url set to /sso/login.
 2015-09-09 15:45:13 +03:00
Stian Thorgersen
3fd4d23bed Version bump 2015-09-09 11:27:21 +02:00
mposolda
149ef706dd KEYCLOAK-1824 ClientIdAndSecretCredentialsProvider not found when deploying Fuse examples 2015-09-08 22:55:43 +02:00
mposolda
050c65a520 KEYCLOAK-1811 Pluggable client authentication config through adapter subsystem 2015-09-07 23:30:08 +02:00
Bill Burke
be0c359160 adapter refactor 2015-09-07 10:27:57 -04:00
Bill Burke
3f792030d3 adapter refactor 2015-09-07 10:26:25 -04:00
Bill Burke
333ad0efac refactor adapters 2015-09-04 15:56:28 -04:00
Marko Strukelj
b0095154d1 KEYCLOAK-1779 NPE due to missing web.xml/jboss-web.xml 
- improved code readability and npe fix
 2015-09-04 14:18:57 +02:00
William DeCoste
e6745532ce KEYCLOAK-1779 2015-09-04 13:52:25 +02:00
Bill Burke
7d4b93e01e client session required actions 2015-09-02 16:30:16 -04:00
mposolda
be8394158f KEYCLOAK-1780 documentation + Generic client authentication screen 2015-09-01 13:17:14 +02:00
Bill Burke
7492ae2990 Merge pull request #1567 from patriot1burke/master 
refactor recover password
 2015-08-31 10:53:29 -04:00
Bill Burke
6edf890699 Merge pull request #1549 from ahus1/ahus1_jetty_contenttype 
KEYCLOAK-1776 / JettySessionTokenStore sets content type on restoring form values
 2015-08-31 10:34:16 -04:00
Bill Burke
22ebb81650 refactor recover password 2015-08-31 10:13:42 -04:00
Bill Burke
3a64c4d582 Merge pull request #1543 from raehalme/KEYCLOAK-1775 
KEYCLOAK-1775 Basic auth no longer redirects on Spring Security
 2015-08-21 21:06:00 -04:00
Marek Posolda
76209dd899 Merge pull request #1555 from mposolda/master 
KEYCLOAK-1295 Fixes and javadoc
 2015-08-21 20:41:21 +02:00
Bill Burke
6f463196ef Merge pull request #1554 from patriot1burke/master 
adapter fixes
 2015-08-21 13:21:02 -04:00
mposolda
b0e2624343 KEYCLOAK-1295 Fixes and javadoc 2015-08-21 19:00:31 +02:00
Bill Burke
457039d7ba fix NPE in adapter for invalid cors requests 2015-08-21 11:29:38 -04:00
Bill Burke
eb4ffbca29 co-existence of bearer and basic auth 2015-08-21 11:02:56 -04:00
mposolda
d8d6348f67 KEYCLOAK-1295 Adapter support. Fixes 2015-08-21 08:26:12 +02:00
Stian Thorgersen
5ca3a48094 KEYCLOAK-1723 Allow aud to be single field or array 2015-08-20 15:55:52 +02:00
Stian Thorgersen
0295824923 KEYCLOAK-1747 
Deal with time inconsistency in keycloak.js
 2015-08-20 13:29:32 +02:00
Alexander Schwartz
7b0a3989e2 JettySessionTokenStore sets content type on restoring form values 
Closes: KEYCLOAK-1776
 2015-08-18 15:32:27 +02:00
mposolda
7028496601 KEYCLOAK-1295 pluggable client authentication. Support authenticate clients with signed JWT 2015-08-17 23:21:23 +02:00
Thomas Raehalme
3a4897c7d2 Separated the error message for Bearer token and Basic authentication failures. 2015-08-17 22:36:59 +03:00
Thomas Raehalme
b3f142d715 KeycloakAuthenticationProcessingFilter now handles Basic Authentication the same way as Bearer token. 2015-08-17 18:05:49 +03:00
Stian Thorgersen
f32b38cdbc KEYCLOAK-1702 KEYCLOAK-1703 Make Infinispan default user session and cache provider 2015-07-29 10:08:15 +02:00
Stian Thorgersen
f3bfb06dec Version bump 2015-07-28 10:20:40 +02:00
Scott Rossillo
1839b24b90 Support for loading keycloak.json from the classpath 
Spring Boot and non-web based applications don't have a WEB-INF
directory. Support loading Spring Security adapter's keycloak.json
from the class path.
 2015-07-19 12:10:33 -04:00
Stian Thorgersen
1642ac2394 KEYCLOAK-1385 Introduce end-of-line normalization 2015-07-17 13:46:51 +02:00
Marko Strukelj
fc7ba85639 KEYCLOAK-1345 Remove distribution/subsystem-war 2015-07-17 12:41:00 +02:00
Marko Strukelj
7ae62c1060 KEYCLOAK-1529 Drop InfinispanCacheActivator and make subsystem do it 2015-07-07 16:40:03 +02:00
Stian Thorgersen
5af4785ba1 KEYCLOAK-1507 
Tomcat Adapter throws NPE under certain conditions
 2015-07-02 09:08:40 +02:00
Marko Strukelj
d00e128920 KEYCLOAK-1448 Cannot configure an authenticator for method KEYCLOAK 2015-06-16 14:51:31 +02:00
Stian Thorgersen
001b874903 Add missing ExampleDS 2015-06-16 14:40:19 +02:00
Stian Thorgersen
1b0c4e5d1f KEYCLOAK-1468 
Infinispan cache not available in JNDI
 2015-06-16 13:31:51 +02:00
Stian Thorgersen
4c98b04ab7 KEYCLOAK-1447 LinkageError deploying oauth-client-cdi to WildFly 8.2.0.Final 2015-06-15 13:22:36 +02:00
Stian Thorgersen
38c1945ce4 Bump version 2015-06-12 14:35:34 +02:00
Stian Thorgersen
cc2de52a1a Revert to old RestEasy until we can drop support for EAP 6.4 2015-06-12 14:20:08 +02:00
Stian Thorgersen
5bd53804f9 Fix admin-api to show that users are retrieved by ip, not username 2015-06-12 13:32:30 +02:00
Stian Thorgersen
5993d40fab Merge pull request #1353 from Smartling/KEYCLOAK-1438 
Fix Spring Security adapter logout handling
 2015-06-12 07:50:00 +01:00
Marko Strukelj
9a37696d29 Fixed pom issues that were generating tons of Maven warnings 2015-06-11 16:57:33 +02:00
Marko Strukelj
92e17f4b40 KEYCLOAK-1412 Server-overlay for EAP 6.4 
- Added as7-server-subsystem
 - Added eap6-server-overlay
 - Moved modules to eap6-server-modules
 - Renamed wildfly-server-subsystem to wf9-server-subsystem for consistency
 2015-06-11 09:40:47 +02:00
Scott Rossillo
abfec23404 Fix Spring Security adapter logout handling 
Stops KeycloakLogoutHandler from throwing an exception if the
authentication is not of type KeycloakAuthenticationToken.

Fixes KEYCLOAK-1438.
 2015-06-10 12:22:18 -04:00
Marko Strukelj
3643e76a06 Cleanup, and simplify keycloak-server-subsystem 
- KEYCLOAK-1346 Remove support for overlays in server subsystem
 - KEYCLOAK-1347 Remove support for multiple auth-servers
 - KEYCLOAK-1348 Simplify server subsystem definition
 2015-06-08 15:33:34 +02:00
mposolda
35e4a5e56d KEYCLOAK-1368 allow forwarding to error page in bearer-only deployments. Adding DeploymentBuilder 2015-06-03 12:34:56 +02:00
Marko Strukelj
3df504b6b4 KEYCLOAK-1304 WF9 server subsystem 
- remove unnecessary dependencies
 2015-06-01 16:07:59 +02:00
Stian Thorgersen
5f787028df KEYCLOAK-1327 Updated for users 2015-05-29 15:29:04 +01:00
Stian Thorgersen
e1e65af8ea Merge pull request #1301 from mstruk/wf9 
KEYCLOAK-1303 WF9 adapter subsystem
 2015-05-29 15:23:28 +01:00
Marko Strukelj
2077a2a3af KEYCLOAK-1303 WF9 adapter subsystem 
- not dependent on distribution/modules any more
 - keycloak-adapter-subsystem moved to keycloak-wf9-subsystem
 - still installed as <extension module="org.keycloak.keycloak-adapter-subsystem"/>
 2015-05-29 15:17:41 +02:00
Stian Thorgersen
a953b52eac KEYCLOAK-1327 Updated for client stats 2015-05-29 13:15:35 +01:00
Stian Thorgersen
6f164f0ee9 KEYCLOAK-1327 Updated for clients 2015-05-29 13:15:34 +01:00
Marko Strukelj
4f270bffd0 Refactor EAP 6 adapter distribution 
- not dependent on distribution/modules any more
 - uses the same modules as AS7
 - again use <extension module="org.keycloak.keycloak-adapter-subsystem"/>
 2015-05-28 23:56:11 +02:00
Marko Strukelj
fa90602aa0 Refactor AS 7 adapter distribution 
- not dependent on distribution/modules any more
 - again use <extension module="org.keycloak.keycloak-adapter-subsystem"/>
 2015-05-28 23:56:11 +02:00
behana
bbc3e99bb5 KEYCLOAK-1353 Option to pass client_id to resetPasswordMail 2015-05-28 00:10:36 +02:00
behana
e8e22ee44c KEYCLOAK-1352 Add send-verify-email to admin-rest-api 2015-05-28 00:05:39 +02:00
Marko Strukelj
d70fd86a82 Wildfly 8.2.0.Final compatibility 
- added integration/keycloak/wf8-subsystem
 - added distribution/adapters/wf8-adapter containing wf8-modules, and wf8-adapter-zip
 - there's no dependency on distribution/modules
 - subsystem is installed by unzipping keycloak-wf8-adapter-dist.zip to Wildfly 8.2.0.Final, and adding <extension-module>org.keycloak.keycloak-wf8-subsystem</extension-module> to standalone.xml
 2015-05-22 17:38:02 +02:00
Stian Thorgersen
4e0a32a37a Version bump 2015-05-22 09:04:30 +02:00
Marko Strukelj
91bf50eb6c AS 7.1.1.Final / EAP 6.4 compatibility 2015-05-21 11:30:26 +02:00
Stian Thorgersen
362babe5e2 Fixed server-dist 2015-05-19 08:15:39 +02:00