diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-06-25 14:33:57 +0100 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-06-25 14:33:57 +0100 |
| commit | f9fe02f91ac72ea2954ee68a5f32d96a237fcd67 (patch) | |
| tree | f91d63ab3d6b9cd3555587090a541c870ecd3363 /.gitignore | |
| parent | 67da8efc720d2d0bd22bd9fe8655b7e983b35bb4 (diff) | |
| parent | 45b3040884d7089e7d8c6f4acccd657b91c92a04 (diff) | |
Merge branch 'master' into fmb-read-only
Conflicts:
.gitignore
bin/make_css
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e56b6ca4a..e0f87998d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,9 +22,16 @@ tags /web/cobrands/fixmystreet/*.css /web/cobrands/bromley/*.css /web/cobrands/fixmybarangay/*.css +/web/photo +/web/cobrands/barnet/*.css /local /web/cobrands/fixmystreet/compass_app_log.txt blog/web/wp blog/conf/general blog/conf/general.deployed + +phonegap/www/js/config.js +phonegap/Android/bin/ +phonegap/iPhone/FixMyStreet.xcodeproj/project.xcworkspace/xcuserdata +phonegap/Android/gen/ |