diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-02-18 13:47:14 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-02-18 13:47:14 +0100 |
| commit | bf086cff8ef680b73ca0300147c3c3b70ab32ae0 (patch) | |
| tree | 1174cdc916982f5f879cde1fc587147a7dced63d /id/server/stork2-commons/src/.svn | |
| parent | 570527d48e3bf03444cdda08a4c1bcf8e7d4ff42 (diff) | |
| parent | 271e22add71f0260f5d421844a2171a09093f505 (diff) | |
| download | moa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.tar.gz moa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.tar.bz2 moa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.zip | |
Merge branch 'datentechnik_modularization' into moa-id-2.2-merge
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
id/server/stork2-commons/pom.xml
id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries
id/server/stork2-commons/src/main/resources/.svn/entries
id/server/stork2-saml-engine/pom.xml
pom.xml
Diffstat (limited to 'id/server/stork2-commons/src/.svn')
| -rw-r--r-- | id/server/stork2-commons/src/.svn/all-wcprops | 5 | ||||
| -rw-r--r-- | id/server/stork2-commons/src/.svn/entries | 34 |
2 files changed, 0 insertions, 39 deletions
diff --git a/id/server/stork2-commons/src/.svn/all-wcprops b/id/server/stork2-commons/src/.svn/all-wcprops deleted file mode 100644 index b2a57db4c..000000000 --- a/id/server/stork2-commons/src/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 49 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src -END diff --git a/id/server/stork2-commons/src/.svn/entries b/id/server/stork2-commons/src/.svn/entries deleted file mode 100644 index 35f74102a..000000000 --- a/id/server/stork2-commons/src/.svn/entries +++ /dev/null @@ -1,34 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -test -dir - -main -dir - |