Skip to content
Snippets Groups Projects
Commit 074f0bde authored by Patrick Barroca's avatar Patrick Barroca
Browse files

version 7.1.43 

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

Conflicts:
	VERSIONS
	library/Class/AdminVar.php
	library/Class/AlbumRessource.php
	library/startup.php
	tests/application/modules/admin/controllers/AlbumControllerTest.php
parents 194e1efd 81384307
Branches
Tags
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