Merge branch '01-master' into 03-beta

Conflicts: espresso.php wp-assets/screenshot-10.jpg wp-assets/screenshot-9.jpg
eventespresso · Jan 10, 2015 · c68e8ae · c68e8ae
2 parents b698844 + a92001b
commit c68e8ae
Show file tree

Hide file tree

Showing 13 changed files with 141 additions and 5 deletions.
diff --git a/info.json b/info.json
@@ -1,22 +1,24 @@
 {
 	"versionFile" : "espresso.php",
 	"slug" : "event-espresso-core-reg",
+	"wpOrgSlug" : "event-espresso-decaf",
+	"wpOrgUser" : "eventespresso",
 	"name" : "Event Espresso Core",
 	"archiveBaseUrl" : "http://build.eventespresso.com/",
 	"archiveBasePath" : "~/www/build/",
 	"releaseFilesRemove" : [
 		"src/tests/**",
 		"src/info.json",
 		"src/circle.yml",
-		"src/screenshot*.jpg",
-		"src/readme.txt"
+		"src/readme.txt",
+		"src/wp-assets/**"
 	],
 	"decafFilesRemove" : [
-		"src/tests**",
+		"src/tests/**",
 		"src/info.json",
 		"src/circle.yml",
-		"src/screenshot*.jpg",
-		"src/caffeinated"
+		"src/caffeinated",
+		"src/wp-assets/**"
 	],
 	"sites" : {
 		"master" : {

diff --git a/wp-assets/banner-772x250.jpg b/wp-assets/banner-772x250.jpg
diff --git a/wp-assets/icon-128x128.png b/wp-assets/icon-128x128.png
diff --git a/wp-assets/icon-256x256.png b/wp-assets/icon-256x256.png
diff --git a/wp-assets/icon.svg b/wp-assets/icon.svg
diff --git a/screenshot-1.jpg → wp-assets/screenshot-1.jpg b/screenshot-1.jpg → wp-assets/screenshot-1.jpg
diff --git a/screenshot-2.jpg → wp-assets/screenshot-2.jpg b/screenshot-2.jpg → wp-assets/screenshot-2.jpg
diff --git a/screenshot-3.jpg → wp-assets/screenshot-3.jpg b/screenshot-3.jpg → wp-assets/screenshot-3.jpg
diff --git a/screenshot-4.jpg → wp-assets/screenshot-4.jpg b/screenshot-4.jpg → wp-assets/screenshot-4.jpg
diff --git a/screenshot-5.jpg → wp-assets/screenshot-5.jpg b/screenshot-5.jpg → wp-assets/screenshot-5.jpg
diff --git a/screenshot-6.jpg → wp-assets/screenshot-6.jpg b/screenshot-6.jpg → wp-assets/screenshot-6.jpg
diff --git a/screenshot-7.jpg → wp-assets/screenshot-7.jpg b/screenshot-7.jpg → wp-assets/screenshot-7.jpg
diff --git a/screenshot-8.jpg → wp-assets/screenshot-8.jpg b/screenshot-8.jpg → wp-assets/screenshot-8.jpg