Merge M2Ys4U-joinfix
authorDarren <darren@darrenwhitlen.com>
Sat, 25 May 2013 18:10:00 +0000 (19:10 +0100)
committerDarren <darren@darrenwhitlen.com>
Sat, 25 May 2013 18:10:00 +0000 (19:10 +0100)
commit660e14277d4c3b13c8e77fe901ca264354a0ad4d
tree346115a9ee187004254869f8a0b86aec717b66f4
parente4a325a48e094405456666e12989bf9cdb4e38b5
parent321eb20b7af67a5bb3a116c6f75de6100bede418
Merge M2Ys4U-joinfix
client/assets/src/models/channel.js
client/assets/src/views/channel.js