diff options
| author | Matthew Somerville <matthew@fury.ukcod.org.uk> | 2011-04-11 13:16:42 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@fury.ukcod.org.uk> | 2011-04-11 13:16:42 +0100 |
| commit | ac527fae7168c2c4f0dc5dcaeb2146ad99c1f835 (patch) | |
| tree | f6d6f08568cad95c6ff835b8557a64dab43ef971 /notes | |
| parent | b453750d1f43bd7b2d9c720f7cd612b7901b059d (diff) | |
| parent | 71ae36012ab91254910247a48824983c3d6a8f37 (diff) | |
Merge commit 'origin/migrate_to_catalyst' into migrate_to_catalyst
Conflicts:
templates/web/default/report/new/report_new.html
Diffstat (limited to 'notes')
| -rw-r--r-- | notes/catalyst-master-merge-todos.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/notes/catalyst-master-merge-todos.txt b/notes/catalyst-master-merge-todos.txt index ea0ec98cd..f536a9d86 100644 --- a/notes/catalyst-master-merge-todos.txt +++ b/notes/catalyst-master-merge-todos.txt @@ -1 +1,4 @@ should we ditch flickr import? (does not seem to be getting huge usage and those using it would probably report using another method: http://www.flickr.com/search/?w=all&q=fixmystreet&m=tags) + +move all FAQ over to TT2 + |