Merge branch 'master' into release/firefox-fix
This commit is contained in:
		@ -106,6 +106,7 @@ solid-router#navbar-router(default-route='dashboard')
 | 
			
		||||
          empty-widget='hubl-create'
 | 
			
		||||
          empty-value='projet'
 | 
			
		||||
          widget-project='hubl-menu-fix-url-project'
 | 
			
		||||
          order-by="project.customer.name"
 | 
			
		||||
        )
 | 
			
		||||
    div.divider
 | 
			
		||||
  if endpoints.circles || (endpoints.get && endpoints.get.circles)
 | 
			
		||||
@ -133,6 +134,7 @@ solid-router#navbar-router(default-route='dashboard')
 | 
			
		||||
          empty-widget='hubl-create'
 | 
			
		||||
          empty-value='cercle'
 | 
			
		||||
          widget-circle='hubl-menu-fix-url-circle'
 | 
			
		||||
          order-by="circle.name"
 | 
			
		||||
        )
 | 
			
		||||
    div.divider
 | 
			
		||||
  if endpoints.users || (endpoints.get && endpoints.get.users)
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user