diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-16 13:20:32 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-16 13:20:32 +0200 |
| commit | 5bc23bcbeb8b82eec3eabce0c582db8fb4a3c64a (patch) | |
| tree | 2a4ed1f53cd2c4d6bde685fb85a062b035b12dbc /spss/server/tools/src/main | |
| parent | 6163edf5f148262122d0049a6945b127f60bad32 (diff) | |
| parent | 5b1d68f71a77b80bd39a9c231090a9c63a892811 (diff) | |
| download | moa-id-spss-5bc23bcbeb8b82eec3eabce0c582db8fb4a3c64a.tar.gz moa-id-spss-5bc23bcbeb8b82eec3eabce0c582db8fb4a3c64a.tar.bz2 moa-id-spss-5bc23bcbeb8b82eec3eabce0c582db8fb4a3c64a.zip | |
Merge remote-tracking branch 'remotes/origin/vidp_2.1_bs' into moa-2.1-Snapshot
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
Diffstat (limited to 'spss/server/tools/src/main')
0 files changed, 0 insertions, 0 deletions