Skip to content
Commit 30a346a7 authored by Francesco Placella's avatar Francesco Placella
Browse files

Merge branch 'revisions' into workbench 

Conflicts:
	includes/translation.handler.inc
parents 45e6cf26 4520f2d5
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