Skip to content

Commit

Permalink
Merge branch '2.2' into 2.3
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/bundle/Resources/views/themes/admin/content/location_view.html.twig
  • Loading branch information
barw4 committed Apr 7, 2021
2 parents cdc354d + 6d23cb4 commit 6843db8
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
'system_urls_pagination_params': system_urls_pagination_params,
'roles_pagination_params': roles_pagination_params,
'policies_pagination_params': policies_pagination_params,
'is_location_visible': location.invisible,
'is_location_visible': not location.invisible,
}) }}

{% if content_type.isContainer %}
Expand Down

0 comments on commit 6843db8

Please sign in to comment.