aboutsummaryrefslogtreecommitdiff
path: root/DocumentService/src/eu/stork/documentservice/model/TempDocumentModel.java
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2015-08-27 13:18:10 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2015-08-27 13:18:10 +0200
commitbd8401b7cec32546edb6f93d0468d60dbe9dfcd0 (patch)
tree25ecd9e074528ea5e9a9771a9bc1659033652d86 /DocumentService/src/eu/stork/documentservice/model/TempDocumentModel.java
parent1051a42329a603821f415383343d253724d4cd65 (diff)
downloadmoa-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 'DocumentService/src/eu/stork/documentservice/model/TempDocumentModel.java')
0 files changed, 0 insertions, 0 deletions