diff options
| author | Jon Pretty <jon.pretty@propensive.com> | 2017-11-30 13:47:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-30 13:47:15 +0100 |
| commit | c698d7db4b6e89392b8ae399333a89b167db20c7 (patch) | |
| tree | bf4a34e519dec8992ded3f92b7ec4acec08c1826 /.gitignore | |
| parent | 834af65ed610d6b1b278b5204801306808a90645 (diff) | |
| parent | e2191e2687b671d4a8610544251e7e807f2793da (diff) | |
| download | magnolia-c698d7db4b6e89392b8ae399333a89b167db20c7.tar.gz magnolia-c698d7db4b6e89392b8ae399333a89b167db20c7.tar.bz2 magnolia-c698d7db4b6e89392b8ae399333a89b167db20c7.zip | |
Merge branch 'master' into patch-1
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,4 +2,4 @@ target .jvm .js .native -.idea/ +.idea |