Skip to content
Snippets Groups Projects
Commit e90c236c authored by Joel Kuder's avatar Joel Kuder
Browse files

Merge branch 'stable-2.x' into 'dev-3.0' 

# Conflicts:
#   adminforce/content/newssystem/news.php
#   content/konto/userprofil.php
parents 8577dd37 a1b5b890
1 merge request!46Release 3.0
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