diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-12-19 07:48:56 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-12-19 07:48:56 +0100 |
| commit | 6e01fbb21b23d187cdb169ef0be8dfc15fc6638f (patch) | |
| tree | d4ba735a5bd2f3f8e3e7f66372ccd5eef46e51fb /id/server/proxy/pom.xml | |
| parent | ddd803e73a4519132ce2257c621b54d004f2235f (diff) | |
| parent | 351f8be591412e124b6d578c1afd3f72f3c25d8f (diff) | |
| download | moa-id-spss-6e01fbb21b23d187cdb169ef0be8dfc15fc6638f.tar.gz moa-id-spss-6e01fbb21b23d187cdb169ef0be8dfc15fc6638f.tar.bz2 moa-id-spss-6e01fbb21b23d187cdb169ef0be8dfc15fc6638f.zip | |
merge last changes to exthex.OAuth testrelease
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/StartAuthenticationBuilder.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
Diffstat (limited to 'id/server/proxy/pom.xml')
| -rw-r--r-- | id/server/proxy/pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index c7cb9a7c8..212ddda71 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -2,7 +2,7 @@ <parent>
<groupId>MOA.id</groupId>
<artifactId>moa-id</artifactId>
- <version>1.9.96-SNAPSHOT</version>
+ <version>1.9.97-SNAPSHOT</version>
</parent>
<properties>
|