aboutsummaryrefslogtreecommitdiff
path: root/id/server/proxy
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-11-03 11:13:38 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-11-03 11:13:38 +0100
commita3e59e5011e16271dab6cc8299a1d1241b4a7fb2 (patch)
treeaae2f450b7296a286c09a8c51d423aec4bedd0dd /id/server/proxy
parent83dc74e60a4d9031285ac27aa0661fe0c26485e0 (diff)
parent1fbff5f5a86733bc6a75c8ae901153baa0963441 (diff)
downloadmoa-id-spss-8213427b4b34a6a09cb1068b6d9836965278f68a.tar.gz
moa-id-spss-8213427b4b34a6a09cb1068b6d9836965278f68a.tar.bz2
moa-id-spss-8213427b4b34a6a09cb1068b6d9836965278f68a.zip
Merge branch 'moa-2.1-Snapshot'MOA-SPSS-2.0.3MOA-ID-2.1.2
Conflicts: .gitignore
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