Merge remote-tracking branch 'helma/master'
Conflicts: .gitignore apps modules
This commit is contained in:
commit
ff7bba76cf
120 changed files with 14792 additions and 48 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -4,3 +4,6 @@ db/*
|
|||
lib/ext
|
||||
modules/
|
||||
server.properties
|
||||
classes/*
|
||||
launcher.jar
|
||||
lib/helma*.jar
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue