diff options
author | Dave Whiteland <dave@mysociety.org> | 2012-04-29 18:14:32 +0100 |
---|---|---|
committer | Dave Whiteland <dave@mysociety.org> | 2012-04-29 18:14:32 +0100 |
commit | 16061e060354affb25701a8c6111ee30df2ac19c (patch) | |
tree | a2d0f949b532f582becff31ef7f79b5deacc4186 /notes/code_structure.txt | |
parent | b38ba427f7facd6e8042ae667b5b3bac1724803a (diff) | |
parent | 1fc50dcc7f65ae04055a803579445a9397e3ffdf (diff) |
Merge branch 'master' into barnet-integration
(prior to go-live... amongst other things, the Barnet web templates had changed.
NB conflict with carton.lock, accepted master in full)
Conflicts:
carton.lock
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 |