Permalink
Browse files

Merge branch 'hotfix/v1.0.3'

  • Loading branch information...
grayghostvisuals committed Aug 29, 2012
2 parents f8979e3 + c65a264 commit 99559ba3c7241ea4161fd6380691d0ab839a7745
Showing with 3 additions and 8 deletions.
  1. +3 −8 README.md
View
@@ -1,7 +1,7 @@
-#WP-Flex v1.0.3 →
+#WP-Flex v1.0.3
[![http://grayghostvisuals.com/wpflex](http://static.grayghostvisuals.com/portfolio/wpflex.png)](http://grayghostvisuals.com/wpflex)
-##DEMO
+###DEMO
[http://grayghostvisuals.com/wpflex](http://grayghostvisuals.com/wpflex)
##WHAT IS IT?
@@ -73,12 +73,7 @@ We strictly follow the Wordpress Coding Guidelines and so should you if you're g
* For WP–Flex we use a [Gitflow Branching Model](http://nvie.com/posts/a-successful-git-branching-model).
This means our branching is kept nice and clean allowing everyone else to see commits, merges and releases in a logical fashion. Please take the time to review this model to ensure your Pull Requests are accepted. The following items listed are the branches and naming conventions we adhere to.
-
- * Master
- * Develop
- * Release
- * Hotfix
- * Feature
+ *Master*, *Develop*, *Release*, *Hotfix*, *Feature*
* Keep it simple and as blank as possible –with the exception of the demo styles.
Feel free to give back to the demo styles if you feel inclined :)

0 comments on commit 99559ba

Please sign in to comment.