diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-08-27 13:18:10 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-08-27 13:18:10 +0200 |
commit | bd8401b7cec32546edb6f93d0468d60dbe9dfcd0 (patch) | |
tree | 25ecd9e074528ea5e9a9771a9bc1659033652d86 /id/oa/src/main/webapp/META-INF | |
parent | 1051a42329a603821f415383343d253724d4cd65 (diff) | |
download | moa-id-spss-bd8401b7cec32546edb6f93d0468d60dbe9dfcd0.tar.gz moa-id-spss-bd8401b7cec32546edb6f93d0468d60dbe9dfcd0.tar.bz2 moa-id-spss-bd8401b7cec32546edb6f93d0468d60dbe9dfcd0.zip |
fix merge problem with OpenID connect
Diffstat (limited to 'id/oa/src/main/webapp/META-INF')
0 files changed, 0 insertions, 0 deletions