Merge branch 'fix-start-with-broken-config' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 12 Dec 2010 16:10:21 +0000 (17:10 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 12 Dec 2010 16:10:21 +0000 (17:10 +0100)
commit2528f9e7901cdbc39c38272b13a939665f00ab80
tree0886a8faa00608dfa28edc4d795f3ee5c0bc4744
parent0ac5c61faa54b62f29bf8c8e9903919315810c80
parent4971f9e74fd42dada71d1c87e641263d1461608d
Merge branch 'fix-start-with-broken-config' into next
src/main/java/net/pterodactylus/sone/web/WebInterface.java