6 Commits

Author	SHA1	Message	Date
Patrick Jentsch	a7e94b8c9b	Add merge images functionality.	2020-01-07 14:39:01 +01:00
Stephan Porada	0b0838f6e0	Fix typo	2020-01-07 13:05:44 +01:00
Stephan Porada	f189460543	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-01-07 13:03:44 +01:00
Stephan Porada	93891a34c9	Add form and service	2020-01-07 13:03:42 +01:00
Patrick Jentsch	0a3f2d3a67	Add newer nlp version	2020-01-07 11:34:16 +01:00
Patrick Jentsch	4b0ef837ad	Some renaming and moving	2019-11-08 12:21:59 +01:00