Merge branch 'master' of github.com:thelia/thelia into cleanmaster

Readme.md

@@ -58,6 +58,11 @@ $ php Thelia thelia:install
 
 You just have to follow all instructions.
 
+Contribute
+----------
+
+see the documentation : http://doc.thelia.net/en/documentation/contribute.html
+
 Usage
 -----
 

templates/backOffice/default/content-edit.html

@@ -155,6 +155,7 @@
         </div>
 
         <div class="tab-pane fade" id="modules">
+            {module_include location='content-edit'}
         </div>
         </div>
         </div>

templates/backOffice/default/folder-edit.html

@@ -255,6 +255,7 @@
 		                    </div>
 
 		                    <div class="tab-pane fade" id="modules">
+                                {module_include location='folder-edit'}
 		                    </div>
 		                 </div>
                     </div>