Merge branch 'docs/zendframework#7112-zf2-logo-on-readme' into develop

Close zendframework#7112 Forward port zendframework#7112
rwellens · Jan 9, 2015 · ff0b5a4 · ff0b5a4
2 parents 0f4e072 + c88da3e
commit ff0b5a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
-### Welcome to the *Zend Framework 2.4* Release!
+![Logo](http://https://raw.githubusercontent.com/zendframework/zf2/234b554f2ca202095aea32e4fa557553f8849664/resources/ZendFramework-logo.png)
+
+# Welcome to the *Zend Framework 2.4* Release!
 
 Master:
 [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?branch=master)](http://travis-ci.org/zendframework/zf2)

diff --git a/resources/ZendFramework-logo.png b/resources/ZendFramework-logo.png