diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-11-19 12:20:55 +0000 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-11-19 12:20:55 +0000 |
| commit | 468f89a56ad2cc69ec4ad4904a18dcf891a505cd (patch) | |
| tree | e0f69cec5ddb98e9e2920c51eb92c00075757559 /.gitignore | |
| parent | 136fd944c596e6cebd5127955fb507ae155725c1 (diff) | |
| parent | b81ba9819a4f33c21354617538a545a6520eb4d1 (diff) | |
Merge branch 'stevenage'
Conflicts:
.gitignore
bin/make_css
conf/crontab.ugly
perllib/FixMyStreet/Cobrand/Default.pm
perllib/Open311.pm
templates/web/fixmystreet/around/postcode_form.html
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index fac10af58..27d7ced66 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ FixMyBarangay.po /web/cobrands/fixmystreet/*.css /web/cobrands/bromley/*.css /web/cobrands/fixmybarangay/*.css +/web/cobrands/stevenage/*.css /web/cobrands/barnet/*.css /web/cobrands/zurich/*.css /web/photo |