diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-06-08 12:27:06 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-06-08 12:27:06 +0100 |
| commit | 66630c094ba7fbb1d05c85de638ae77a8ad8e043 (patch) | |
| tree | 3331bdcfb76e8b0cbe33d2a38045d87232f7ac9d /.gitignore | |
| parent | aabfdd765ea0217c12307a1effa3852c00eac6a4 (diff) | |
| parent | aa59f68fcb9b26673662033c4c2d72835420ab4a (diff) | |
Merge branch 'barnet-newstyle'
Conflicts:
.gitignore
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
perllib/FixMyStreet/Cobrand/UKCouncils.pm
templates/web/default/reports/council.html
templates/web/fixmystreet/header.html
templates/web/fixmystreet/report/display.html
web/cobrands/bromley/layout.scss
web/cobrands/fixmystreet/fixmystreet.js
web/js/map-OpenLayers.js
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 30daa380c..4bd5e9d39 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ tags /web/cobrands/fixmystreet/*.css /web/cobrands/bromley/*.css /web/photo +/web/cobrands/barnet/*.css /local /web/cobrands/fixmystreet/compass_app_log.txt |