Merge branch 'master' into chennesFixAreaTypo

2025-11-13 13:39:09 +02:00 · 2025-11-13 13:39:09 +02:00 · 3f6938d0ee
commit 3f6938d0ee
parent e703d1dcf4 c2238b9025
22 changed files with 27 additions and 27 deletions
--- a/app/views/admin/registration_periods/_form.html.haml
+++ b/app/views/admin/registration_periods/_form.html.haml
@ -1,5 +1,5 @@
 %p
-  Setup the time frame in which people can registrer to your conference
+  Setup the time frame in which people can register to your conference
 = form_for(@registration_period, url: admin_conference_registration_period_path(@conference.short_title)) do |f|
  .form-group
    = f.label :start_date
--- a/app/views/admin/tracks/edit.html.haml
+++ b/app/views/admin/tracks/edit.html.haml
@ -2,7 +2,7 @@
  .col-md-12
    .page-header
      %h1
-        Edit Tack
+        Edit Track
        = @track.name
 .row
  .col-md-12