Skip to content
Permalink
Browse files

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

  • Loading branch information
GabAlexandria committed Nov 27, 2019
2 parents e4b09a0 + b227ec0 commit a4552ee66ef1a81df369c606a7dd0339dc3ae7f4
Showing with 3 additions and 2 deletions.
  1. +2 −1 Gemfile.lock
  2. +1 −1 app/components/help_getting_online/_help_getting_online.html.erb
@@ -331,7 +331,8 @@ GEM
rack (2.0.7)
rack-accept (0.4.5)
rack (>= 0.4)
rack-cors (1.0.3)
rack-cors (1.0.6)
rack (>= 1.6.0)
rack-proxy (0.6.5)
rack
rack-test (1.1.0)
@@ -19,7 +19,7 @@
<% if places.any? %>
<ul>
<% places.each do |location| %>
<li><%= link_to location.name, place_url(location) %></li>
<li><%= link_to location.name, places_url(location) %></li>
<% end %>
</ul>
<% else %>

0 comments on commit a4552ee

Please sign in to comment.
You can’t perform that action at this time.