Commit 35788416 authored by Christine Plumejeaud's avatar Christine Plumejeaud
Browse files

Merge branch 'master' of https://gitlab.huma-num.fr/portic/gazetteer

# Conflicts:
#	porticgaz.py
parents 50edee48 5b10c6c1
Supports Markdown
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