Skip to content
Commit 1d7c7ebe authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'develop' into '6497_php_sort_version_3' 

# Conflicts:
#   install/sql/incremental/upd_dev_collection.sql
parents 695aaad9 9a109822
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