diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-03-16 13:13:10 +0100 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-03-16 13:13:10 +0100 |
commit | 3a80aa7e900c77da7625886f72ee22666ecfae23 (patch) | |
tree | 5eef5ac02252c1f493908e34c773751987b257b1 /id/moa-id-webgui | |
parent | 226db2c5c41c149256459bf18dff4585a07e5ea1 (diff) | |
parent | d69ba86f0855097e46e525794075f3c743e7facb (diff) | |
download | moa-id-spss-3a80aa7e900c77da7625886f72ee22666ecfae23.tar.gz moa-id-spss-3a80aa7e900c77da7625886f72ee22666ecfae23.tar.bz2 moa-id-spss-3a80aa7e900c77da7625886f72ee22666ecfae23.zip |
Merge branch 'Branch_MOA-ID-3.2.1' into development_preview
# Conflicts:
# id/server/moa-id-commons/pom.xml
# pom.xml
Diffstat (limited to 'id/moa-id-webgui')
-rw-r--r-- | id/moa-id-webgui/pom.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/id/moa-id-webgui/pom.xml b/id/moa-id-webgui/pom.xml index 31247efc1..a3b3675ef 100644 --- a/id/moa-id-webgui/pom.xml +++ b/id/moa-id-webgui/pom.xml @@ -29,7 +29,6 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> <configuration> <source>1.7</source> <target>1.7</target> |