diff options
| author | czaks <marcin@6irc.net> | 2014-01-20 09:07:40 +0100 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2014-01-20 09:07:40 +0100 |
| commit | 0620f13392348e812df0f7a44f9c96f51a28d718 (patch) | |
| tree | e3e08d928554d02f073678b639d42b20aa645159 /stylesheets | |
| parent | 46e9b30225d5031667ee66bb4110b7d200786d4c (diff) | |
| parent | c043c424454fce071e4ed7841f26c427cecf19ff (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
js/auto-reload.js
js/post-hover.js
js/quick-reply.js
js/youtube.js
stylesheets/style.css
Diffstat (limited to 'stylesheets')
| -rw-r--r-- | stylesheets/style.css | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/stylesheets/style.css b/stylesheets/style.css index 1479291d..09dbc6d7 100644 --- a/stylesheets/style.css +++ b/stylesheets/style.css @@ -570,4 +570,3 @@ form.ban-appeal textarea { display: inline-block; vertical-align: middle; } - |