Skip to content
Snippets Groups Projects
Commit 8b46378c authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master 

# Conflicts:
#	VERSIONS
#	library/startup.php
#	library/translation/en.mo
#	library/translation/en.po
parents dda2ed82 7e270168
2 merge requests!1902Master,!1896Master
Hide whitespace changes
Inline Side-by-side
Showing
with 44 additions and 6 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