diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-02-22 13:07:58 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-02-22 13:07:58 +0100 |
| commit | 2fc3b03239590d98ad776710f84444d1b4f65df3 (patch) | |
| tree | 6c7ef4f9e6cf4401cfda18e7852966626af062c6 /id/readme_1.4.7.txt | |
| parent | f81e455bfc1bdd23ce89bfcc0b626210417d0cbb (diff) | |
| parent | 1415029cd821ddcc8a3375b5f5e1473747e0d2d7 (diff) | |
| download | moa-id-spss-2fc3b03239590d98ad776710f84444d1b4f65df3.tar.gz moa-id-spss-2fc3b03239590d98ad776710f84444d1b4f65df3.tar.bz2 moa-id-spss-2fc3b03239590d98ad776710f84444d1b4f65df3.zip | |
Merge remote-tracking branch 'remotes/origin/moa-id-3.0.0-snapshot' into moa-id-3.2_(OPB)
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java
Diffstat (limited to 'id/readme_1.4.7.txt')
0 files changed, 0 insertions, 0 deletions