diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
| commit | 2e0a4e8ec45579e4e5c9cf8aa123d5ab215b9703 (patch) | |
| tree | c13e3c59b686e01460dc7960547f7e9c53c288bd /.gitignore | |
| parent | b99c5ff97b29a27eeba52ed24385ac30388e875c (diff) | |
| parent | 88a7d38dffa3dabdf0f85573b254cea9c8ab232b (diff) | |
Merge remote-tracking branch 'origin/master' into fmb-read-only
Conflicts:
.gitignore
bin/make_css
conf/general.yml-example
perllib/FixMyStreet/App/Controller/Council.pm
perllib/FixMyStreet/App/Controller/Report/New.pm
perllib/FixMyStreet/Cobrand/Default.pm
templates/web/default/around/around_index.html
templates/web/default/index.html
templates/web/emptyhomes/index.html
templates/web/fixmystreet/around/around_index.html
templates/web/fixmystreet/index.html
web/fixmystreet_app_cgi.cgi
web/fixmystreet_app_fastcgi.cgi
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index e0f87998d..8034d46d2 100644 --- a/.gitignore +++ b/.gitignore @@ -14,16 +14,22 @@ inc/ _Inline/ lib tags + +*.mo +FixMyStreet-EmptyHomes.po + /web/cobrands/fiksgatami/css.css /web/cobrands/southampton/css.css /web/cobrands/reading/css/css.css /web/css/core.css /web/css/main.css +/web/cobrands/default/*.css /web/cobrands/fixmystreet/*.css /web/cobrands/bromley/*.css /web/cobrands/fixmybarangay/*.css -/web/photo /web/cobrands/barnet/*.css +/web/cobrands/zurich/*.css +/web/photo /local /web/cobrands/fixmystreet/compass_app_log.txt |