diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-09-28 15:36:21 +0200 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-09-28 15:36:21 +0200 |
| commit | 0c1b02bead38d5a58032a1c88cf3ca53bbc4a4d9 (patch) | |
| tree | b9cb574a1964f28dda648795010a5be056b80618 /lib/tpl/dokuwiki/css/basic.less | |
| parent | 618191d008b98cb421694c541145c863d7b300ce (diff) | |
| parent | da9572711f54d13ce3c5506971154b0bc359723f (diff) | |
| download | rpg-0c1b02bead38d5a58032a1c88cf3ca53bbc4a4d9.tar.gz rpg-0c1b02bead38d5a58032a1c88cf3ca53bbc4a4d9.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonly
Conflicts:
inc/lang/hr/searchpage.txt
inc/lang/ko/searchpage.txt
Diffstat (limited to 'lib/tpl/dokuwiki/css/basic.less')
| -rw-r--r-- | lib/tpl/dokuwiki/css/basic.less | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/tpl/dokuwiki/css/basic.less b/lib/tpl/dokuwiki/css/basic.less index c296185e9..ac9f6803a 100644 --- a/lib/tpl/dokuwiki/css/basic.less +++ b/lib/tpl/dokuwiki/css/basic.less @@ -455,6 +455,7 @@ input[disabled], button[disabled], select[disabled], textarea[disabled], +option[disabled], input[readonly], button[readonly], select[readonly], |