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

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

* origin/pr/783:
  translation update

Conflicts:
	inc/lang/es/edit.txt
	lib/plugins/extension/lang/es/lang.php
parents 0d04ee26 a3e7723b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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