Merge branch 'develop' of cvs2:WP-Themes/parrotslanding into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 20 Jun 2016 13:09:10 +0000 (09:09 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 20 Jun 2016 13:09:10 +0000 (09:09 -0400)
commit127844ea648a053abedb925389892a6eb29aa9dc
tree9c756c592b0c3e5a6b51aae7c78251b3e6e94af6
parent9cb1af6b51686e96ec96f1226c10760a30fb30ef
parent003bc237746fb6dff388a28eaffba0ac75bd05be
Merge branch 'develop' of cvs2:WP-Themes/parrotslanding into develop