projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 700ef8b 9d8f8df)
Merge pull request #254 from M2Ys4U/colour
authorDarren <darren@darrenwhitlen.com>
Wed, 15 May 2013 19:03:26 +0000 (12:03 -0700)
committerDarren <darren@darrenwhitlen.com>
Wed, 15 May 2013 19:03:26 +0000 (12:03 -0700)
Fix issue where making links clickable conflicted with formatting codes

1  2 
client/assets/css/style.css patch | diff1 | diff2 | blob | history
client/assets/dev/view.js patch | diff1 | diff2 | blob | history

diff --cc client/assets/css/style.css
Simple merge
diff --cc client/assets/dev/view.js
Simple merge