Merge remote-tracking branch 'github/master'

3c23b651 · Robert Speicher · ab72c120 · 536706fa · 3c23b651
Commit 3c23b651 authored 9 years ago by Robert Speicher
--- a/app/views/projects/ci_settings/_no_runners.html.haml
+++ b/app/views/projects/ci_settings/_no_runners.html.haml
@@ -5,4 +5,4 @@
    You can add Specific runner for this project on Runners page
  
    - if current_user.admin
-      or add Shared runner for whole application in admin are.
+      or add Shared runner for whole application in admin area.