summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2015-02-23 14:30:52 +0000
committerRobert Schilling <rschilling@student.tugraz.at>2015-02-23 14:30:52 +0000
commitc8dad4f6112acba1f90d5c4bc7752f3ae223dd86 (patch)
treecff16bcf845060fcd433ea2ef3dd5c3cd25add3a
parent9459e9db2470e9c50488811d1d0fcdd025a327d0 (diff)
parent48eeb006f08a1bdea9cd8ad4dc49819a8daccf51 (diff)
downloadgitlab-ce-c8dad4f6112acba1f90d5c4bc7752f3ae223dd86.tar.gz
Merge branch 'spelling-correction' into 'master'
Small spelling correction There's a small spelling error on the project settings page. 'an project' is not correct English. See merge request !348
-rw-r--r--app/views/projects/edit.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 8240c186616..b4c36beda88 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -86,7 +86,7 @@
- if @project.avatar?
You can change your project avatar here
- else
- You can upload an project avatar here
+ You can upload a project avatar here
%a.choose-btn.btn.btn-small.js-choose-project-avatar-button
%i.icon-paper-clip
%span Choose File ...