diff options
| author | ritchie <ritchie@gmx.at> | 2015-09-12 08:21:32 +0200 |
|---|---|---|
| committer | ritchie <ritchie@gmx.at> | 2015-09-12 08:21:32 +0200 |
| commit | 2ac451afa642739b14a02424e933d9313350f4c6 (patch) | |
| tree | 1b68fafe8633bd410e991726023fc37b9c67cd71 /pom.xml | |
| parent | 350ed420bc91cfa8b6f57478691777fd6499363b (diff) | |
| parent | 4d2c4ad56fe28b0a96d90dfa3e6d4887988e8c00 (diff) | |
| download | nanohttpd-2ac451afa642739b14a02424e933d9313350f4c6.tar.gz | |
Merge branch 'originalMaster' of https://github.com/vnnv/nanohttpd into vnnv-originalMaster
Conflicts:
pom.xml
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -89,6 +89,7 @@ <module>websocket</module> <module>markdown-plugin</module> <module>nanolets</module> + <module>fileupload</module> </modules> <licenses> <license> |