diff options
| author | Irving Gonzalez <ialexis93@gmail.com> | 2015-06-10 11:24:49 -0600 |
|---|---|---|
| committer | Irving Gonzalez <ialexis93@gmail.com> | 2015-06-10 11:24:49 -0600 |
| commit | a024db7609997039e71b5369496b3e8e687a130b (patch) | |
| tree | 5c7d8a5c668bffe604a1c35594a170984b944f8b /.gitignore | |
| parent | d8f950b6b90f3ce144fd2ae78184844ffbacc9b7 (diff) | |
| parent | ae56bc9e1f212bf96c3573b43fb8b11983bbb3e1 (diff) | |
| download | trackermap-server-a024db7609997039e71b5369496b3e8e687a130b.tar.gz trackermap-server-a024db7609997039e71b5369496b3e8e687a130b.tar.bz2 trackermap-server-a024db7609997039e71b5369496b3e8e687a130b.zip | |
Merge branch 'master' of https://github.com/tananaev/traccar
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 3fe98582b..fde2c462f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ -/target +target +nbactions.xml .classpath .project -.settings/ +.settings +web/.idea |