Skip to content
Commit 635ac21a authored by Karel Štěpka's avatar Karel Štěpka
Browse files

Merge branch 'plugins' into develop 

# Conflicts:
#	arthropod_describer/app.py
#	arthropod_describer/tag_filter_widget.py
parents 0f1c4c29 15798f62
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment