developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into ldap

Browse Source 
Conflicts:
	app/assets/stylesheets/new_admin.css.erb
This commit is contained in:
Christophe Vilayphiou committed 2012-04-23 14:13:37 +08:00
2 parents b6f64cd8a5 09910ca4ae
commit 2eeb530422
19 files changed
+148 -44
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/stylesheets/widget.css
+1 -1
View File
@@ -59,7 +59,7 @@
}
.select-role {
display:none;
padding: 10px 0;
overflow:hidden;
}
.file-upload {
position:relative;