Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
This commit is contained in:
		
						commit
						cca2b8fd6c
					
				| 
						 | 
				
			
			@ -16,7 +16,7 @@
 | 
			
		|||
			</div>
 | 
			
		||||
			<ul class="nav">
 | 
			
		||||
				<li><%= link_to t(:homepage), root_path, :class => 'orbit-bar-home' %></li>
 | 
			
		||||
				<li><a class="orbit-bar-desktop" href="#">Desktop</a></li>
 | 
			
		||||
				<li><a class="orbit-bar-desktop" href="https://i.nccu.edu.tw/Login.aspx?ReturnUrl=/Default.aspx" target="_blank">Desktop</a></li>
 | 
			
		||||
			</ul>
 | 
			
		||||
			<ul class="nav pull-right">
 | 
			
		||||
        <li class="dropdown language">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue