Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision | Next revisionBoth sides next revision | ||
| resilients:future_preparedness [2012-04-12 13:23] – nik | resilients:future_preparedness [2012-04-12 16:10] – maja | ||
|---|---|---|---|
| Line 12: | Line 12: | ||
| * Resilients Journeyers | * Resilients Journeyers | ||
| * Resilients Salons | * Resilients Salons | ||
| - | * [[foreground_research|Foreground Research]] | + | |
| - | * [[background_research|Background Research]] | + | |
| === in progress === | === in progress === | ||
| * [[future preparedness notes]] | * [[future preparedness notes]] | ||
| * [[scenario planning]] | * [[scenario planning]] | ||
| + | * [[foreground_research|Foreground Research]] | ||
| + | * [[background_research|Background Research]] | ||
maja