Merge branch 'master' into develop

This commit is contained in:
Simon Brooke 2017-07-24 07:00:09 +01:00
commit a1fa392699
2 changed files with 18 additions and 18 deletions

1
.gitignore vendored
View file

@ -17,3 +17,4 @@ pom.xml.asc
smeagol.log*
/node_modules/
.DS_Store