projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ca559c 21e3d14)
Merge branch 'multi_server' into development
authorDarren <darren@Darrens-MacBook-Pro.local>
Thu, 9 May 2013 15:48:09 +0000 (16:48 +0100)
committerDarren <darren@Darrens-MacBook-Pro.local>
Thu, 9 May 2013 15:48:09 +0000 (16:48 +0100)
1  2 
client/assets/css/style.css patch | diff1 | diff2 | blob | history
client/assets/dev/index.html.tmpl 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/index.html.tmpl
Simple merge
diff --cc client/assets/dev/view.js
Simple merge