diff options
| author | Andreas Reiter <andreas.reiter@iaik.tugraz.at> | 2014-02-28 13:53:30 +0100 |
|---|---|---|
| committer | Andreas Reiter <andreas.reiter@iaik.tugraz.at> | 2014-02-28 13:53:30 +0100 |
| commit | 9138fc3cf75f4fff39262c304a5834fc8aaf6cf7 (patch) | |
| tree | 6f925b7b9f2b4b4e7d7beee52ded05989322c551 /id/server/licenses | |
| parent | 0a69374bc8c126ebe9659eebe33673169321a106 (diff) | |
| parent | a04189917f59dcc532e088ad366da67e31f62ffd (diff) | |
| download | moa-id-spss-9138fc3cf75f4fff39262c304a5834fc8aaf6cf7.tar.gz moa-id-spss-9138fc3cf75f4fff39262c304a5834fc8aaf6cf7.tar.bz2 moa-id-spss-9138fc3cf75f4fff39262c304a5834fc8aaf6cf7.zip | |
Merge remote-tracking branch 'remotes/origin/ap' into moa2_0_tlenz_bs_3_ar
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
Diffstat (limited to 'id/server/licenses')
0 files changed, 0 insertions, 0 deletions