diff options
| author | Joris | 2017-03-24 09:21:06 +0000 |
|---|---|---|
| committer | Joris | 2017-03-24 09:21:06 +0000 |
| commit | c0ac16a713c4e53cf6af8e72a6d5f6b8ac5d6456 (patch) | |
| tree | 8a438430cee7411259fc395d8f3898488e85d750 /.gitignore | |
| parent | 293eb8295162bf0a038f488237db9c9d1316c04d (diff) | |
| parent | cfca18262c1ff48dcb683ddab7d03cf8e55573ff (diff) | |
Merge branch 'features/categories' into 'master'
Features/categories
See merge request !1
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,8 +1,8 @@ -dist/ database database-shm database-wal elm-stuff/ -public/javascripts/*.js +.stack-work +public/javascripts sessionKey local.conf |