Skip to content
Snippets Groups Projects
Commit 6b0bcc72 authored by Maja Jablonska's avatar Maja Jablonska
Browse files

Merge branch 'master' of https://gitlab.clarin-pl.eu/syntactic-tools/combo-lightning

# Conflicts:
#	combo/config/from_parameters.py
#	combo/models/archival.py
#	combo/modules/model.py
parents b8d64d27 fbd2417a
1 merge request!46Merge COMBO 3.0 into master
Showing
with 1718 additions and 323 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment