diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-07-25 22:36:30 +0400 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-07-25 22:36:30 +0400 |
| commit | 61c85332d2ab8545323a897724439526297c8899 (patch) | |
| tree | cd071f74570f543c08394e6fcae1029fa7894f23 /app/assets | |
| parent | 5133541f25f91b83d17550983bd4cf93d39ae574 (diff) | |
| parent | 04a85f458214304b8d96a1ea052b40e171a3f2f5 (diff) | |
Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments
Conflicts:
app/controllers/admin/mailer_controller.rb
app/controllers/notes_controller.rb
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/notes.scss | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/notes.scss b/app/assets/stylesheets/notes.scss index 39db704b1a9..39e03813a8b 100644 --- a/app/assets/stylesheets/notes.scss +++ b/app/assets/stylesheets/notes.scss @@ -14,7 +14,8 @@ border-bottom:1px solid #aaa; } -.issue_notes { +.issue_notes, +.wiki_notes { .note_content { float:left; width:400px; |