fixes conflicts with master

This commit is contained in:
rgarcia
2016-07-19 15:50:22 +02:00
18 changed files with 317 additions and 44 deletions

View File

@@ -1,2 +1,5 @@
// Overrides and adds customized styles in this file
//
// Read more on documentation:
// * English: https://github.com/consul/consul/blob/master/CUSTOMIZE_EN.md#css
// * Spanish: https://github.com/consul/consul/blob/master/CUSTOMIZE_ES.md#css
//