Merge branch 'solstice'

Conflicts:
	index.php


Signed-off-by: Christopher Guindon <chris.guindon@eclipse.org>
tree: 42aeb2c33d501cd829ed37eaaa2577931c15999f
  1. assets/
  2. content/
  3. index.php
  4. planning/