fixes conflicts with master

This commit is contained in:
rgarcia
2016-01-22 12:34:29 +01:00
parent 93d794c089
commit a86f6bc5b7
2 changed files with 8 additions and 2 deletions

View File

@@ -260,7 +260,9 @@ en:
proposal_title: Proposal title
proposal_video_url: Link to external video
proposal_video_url_note: You may add a link to YouTube or Vimeo
tags_instructions: Tag this proposal. You can choose from our tags or add your own.
tag_category_label: "Categories"
tag_district_label: "Districts"
tags_instructions: "Tag this proposal. You can choose from proposed categories and districts or add your own"
tags_label: Tags
tags_placeholder: Enter the tags you would like to use, separated by commas (',')
index: