Merge branch 'master' into poll-shifts

This commit is contained in:
Raimond Garcia
2017-09-05 14:45:31 +02:00
committed by GitHub
127 changed files with 2421 additions and 293 deletions

View File

@@ -879,7 +879,7 @@ en:
content_blocks:
form:
content_blocks_information: Information about content blocks
content_block_about: You can create HTML content blocks to be inserted in the header or the footer of your Consul.
content_block_about: You can create HTML content blocks to be inserted in the header or the footer of your CONSUL.
content_block_top_links_html: "<strong>Header blocks (top_links)</strong> are blocks of links that must have this format:"
content_block_footer_html: "<strong>Footer blocks</strong> can have any format and can be used to insert Javascript, CSS or custom HTML."
create: