Merge branch 'master' into v7.0

Change-Id: Ib897981a21e8cf5c5a5b814334520d3b0dc80693
Signed-off-by: lombardofr <lombardo@everyup.it>

diff --git a/projecthandler/template/project/osm/osm_project_left_sidebar.html b/projecthandler/template/project/osm/osm_project_left_sidebar.html
index 6245261..8955c13 100644 (file)
--- a/projecthandler/template/project/osm/osm_project_left_sidebar.html
+++ b/projecthandler/template/project/osm/osm_project_left_sidebar.html
@@ -137,12 +137,12 @@ limitations under the License.
                         </li>
                 </ul>
             </li>
-<!--             {% url "osm:list"   as  osmrepo_list_url %}
+            {% url "osm:list"   as  osmrepo_list_url %}
             <li {% if request.get_full_path == osmrepo_list_url %} class="active" {% endif %} >
                 <a href='{% url "osmr:list"   %}'>
                     <i class="fa fa-folder fa-fw"></i><span>OSM Repositories</span>
                 </a>
-            </li> -->
+            </li>
             {% url "wims:list"   as  wim_list_url %}
             <li {% if request.get_full_path == wim_list_url %} class="active" {% endif %}>
                 <a href='{% url "wims:list"   %}'>