diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2012-05-16 14:30:30 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2012-05-16 14:30:30 +0100 |
| commit | d9f3bd47a94116871893f0417e7c836400bb04eb (patch) | |
| tree | 1c140a6cb9ea3fd60dbf1532d2cb0bcfdaa703ad /notes/code_structure.txt | |
| parent | 1ba0a33c9fa19f2fa46f16678785d1c90ed33eb0 (diff) | |
| parent | 194173589eed229567646cedfc0e32621d18f1e7 (diff) | |
Merge branch 'master' into bromley
Conflicts:
bin/send-reports
conf/crontab.ugly
conf/general.yml-example
db/schema.sql
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/App/Controller/Report/New.pm
perllib/FixMyStreet/DB/Result/Comment.pm
perllib/FixMyStreet/DB/Result/Open311conf.pm
perllib/FixMyStreet/DB/Result/Problem.pm
perllib/FixMyStreet/DB/Result/User.pm
templates/web/default/js/validation_strings.html
templates/web/fixmystreet/auth/sign_out.html
templates/web/fixmystreet/report/new/councils_text_all.html
web/cobrands/fixmystreet/_base.scss
Diffstat (limited to 'notes/code_structure.txt')
| -rw-r--r-- | notes/code_structure.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/notes/code_structure.txt b/notes/code_structure.txt index 8c01fba8b..c90db1784 100644 --- a/notes/code_structure.txt +++ b/notes/code_structure.txt @@ -3,7 +3,7 @@ The code is broken down into the following sections: website: code to display the website and handle user submissions backend: send alerts to the councils, work out who should get the alert, various -confirmtaion emails +confirmation emails mobile apps: currently for iPhone and Android - two separate apps |