Merge remote-tracking branch 'origin/master' into next

alindeman · alindeman · commit f443a06d8d0d · 2025-01-23T14:35:59.000-05:00
diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
@@ -1,4 +1,4 @@
-<%= link_to "Home 2024", root_path, :class => 'brand', :tabindex => "-1" %>
+<%= link_to "Home 2025", root_path, :class => 'brand', :tabindex => "-1" %>
 <ul class="nav">
   <% if diver_signed_in? %>
     <li style="font-weight:900;font-size:12px" >

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<%= link_to "Home 2024", root_path, :class => 'brand', :tabindex => "-1" %>`
	`1`	`+<%= link_to "Home 2025", root_path, :class => 'brand', :tabindex => "-1" %>`
`2`	`2`	`<ul class="nav">`
`3`	`3`	`<% if diver_signed_in? %>`
`4`	`4`	`<li style="font-weight:900;font-size:12px" >`