Merge branch 'develop' of git://projects.ceondo.com/indefero into develop
This commit is contained in:
commit
0334e88625
@ -295,7 +295,7 @@ class IDF_Form_UserAccount extends Pluf_Form
|
||||
return '';
|
||||
}
|
||||
|
||||
if (preg_match('#^ssh\-[a-z]{3}\s\S+==(\s\S+)?$#', $key)) {
|
||||
if (preg_match('#^ssh\-[a-z]{3}\s\S+(\s\S+)?$#', $key)) {
|
||||
$key = str_replace(array("\n", "\r"), '', $key);
|
||||
|
||||
if (Pluf::f('idf_strong_key_check', false)) {
|
||||
|
@ -702,6 +702,14 @@ div.deprecated-page {
|
||||
color: #a00;
|
||||
}
|
||||
|
||||
ul > li {
|
||||
list-style: disc outside none;
|
||||
}
|
||||
|
||||
ol > li {
|
||||
list-style: decimal outside none;
|
||||
}
|
||||
|
||||
#branding {
|
||||
float: right;
|
||||
position: relative;
|
||||
|
Loading…
Reference in New Issue
Block a user