Skip to content
Snippets Groups Projects
Commit 770df009 authored by Diana Huang's avatar Diana Huang
Browse files

Merge pull request #2493 from danielcebrian/daniel-branch-fix 

fixed conflict between Annotator and internationalitation
parents 2e28279b 1a62379a
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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