aboutsummaryrefslogtreecommitdiff
path: root/id/server/proxy
diff options
context:
space:
mode:
authorAlexander Marsalek <amarsalek@iaik.tugraz.at>2014-10-31 16:26:19 +0100
committerAlexander Marsalek <amarsalek@iaik.tugraz.at>2014-10-31 16:26:19 +0100
commitbce35f534b42d77cdaf1ab8e861237d1cf2f1191 (patch)
tree4daf3b9a89647ff08ddd6414b7ccddd59db5e5d5 /id/server/proxy
parent9c6fece57add83ce29e6ba1acc55a11d2ed89fc0 (diff)
parent2886006ba2ca141377e66a330df5fc52797c2755 (diff)
downloadmoa-id-spss-bce35f534b42d77cdaf1ab8e861237d1cf2f1191.tar.gz
moa-id-spss-bce35f534b42d77cdaf1ab8e861237d1cf2f1191.tar.bz2
moa-id-spss-bce35f534b42d77cdaf1ab8e861237d1cf2f1191.zip
Merge branch 'merge' into moa-2.1-Snapshot
Diffstat (limited to 'id/server/proxy')
-rw-r--r--id/server/proxy/.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/id/server/proxy/.gitignore b/id/server/proxy/.gitignore
new file mode 100644
index 000000000..4dc009173
--- /dev/null
+++ b/id/server/proxy/.gitignore
@@ -0,0 +1,2 @@
+/target
+/bin