Rowan Miller 9a411df59f Merge branch 'release' into dev ... # Conflicts: # src/PageGenerator/project.json		2016-05-10 12:34:53 -07:00
..
PageGenerator.xproj	Remove project name from output path	2016-03-02 16:39:31 -08:00
Program.cs	Include instructions for PMC migrations commands	2016-05-10 12:08:12 -07:00
project.json	Merge branch 'release' into dev	2016-05-10 12:34:53 -07:00