Merge remote-tracking branch 'origin/master' into issue-68

This commit is contained in:
Richard Underwood 2016-09-20 10:23:10 +01:00
commit bc95d31121

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
includes/config.inc.php includes/config.inc.php
nsedit.sublime* nsedit.sublime*
etc