2 commits

Author	SHA1	Message	Date
Joe Haddad	86160a5190	Upgrade to Prettier 2 (#13061)	2020-05-18 15:24:37 -04:00
JJ Kasper	bf184fceeb	Update to merge props from GSSP methods with _app pageProps (#11709) ... * Add warning for pageProps GSSP conflict * Update warning * Update to merge pageProps instead of warn on conflict * bump * Update merging	2020-04-07 11:33:26 -04:00