Merge pull request #59 from mpeuster/master
authorpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 21 Mar 2016 07:48:31 +0000 (08:48 +0100)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 21 Mar 2016 07:48:31 +0000 (08:48 +0100)
commit35c05a1d9a095350f0bd9acb88c3e99e1a884fcd
tree1371f1a9f6a6726a72b38989d61a3fdfd4d4d1ac
parent467b90856881c9422aa327958df060e515c736dc
parent71b3a2f2ec214416524e4c3687b3c1136fb5281c
Merge pull request #59 from mpeuster/master

Resource model and integration