Skip to content
Snippets Groups Projects
Commit 47b258d3 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

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

Conflicts:
	VERSIONS
	library/ZendAfi/Controller/Plugin/Manager/Album.php
	library/startup.php
parents 3f50f1c5 6cdf9e5c
1 merge request!2471Master
Pipeline #3304 passed with stage
in 25 minutes and 2 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 123 additions and 60 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