Skip to content
Snippets Groups Projects
Commit 0d04ee26 authored by Andreas Gohr's avatar Andreas Gohr
Browse files

Merge remote-tracking branch 'origin/pr/787' 

* origin/pr/787:
  translation update

Conflicts:
	inc/lang/es/edit.txt
parents 91e0b664 3af8317e
No related branches found
No related tags found
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