Skip to content

Commit

Permalink
Merge branch '2.0' into 3.3
Browse files Browse the repository at this point in the history 
# Conflicts:
#	lib/Resources/config/container/solr/slots.yml
  • Loading branch information
@barw4
barw4 committed Dec 10, 2021
2 parents c670f01 + 55e719a commit 3d0d2a0
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 3d0d2a0

Please sign in to comment.