[tor-commits] [pups/master] Merge remote-tracking branch 'sherief/webchat_patches'

commit 9d1cdab390c3839b8bdf3cc7717ed51ed8095ffb Merge: 57a54ad fad8d3f Author: Lunar lunar@loar Date: Sat Oct 11 11:48:13 2014 +0200

Merge remote-tracking branch 'sherief/webchat_patches'

pups/settings.py.sample | 1 + static/css/styles.css | 1 + static/js/prodromus.js | 47 ++++++++++++++++++-------------------- webchat/models.py | 27 ++++++++++++++-------- webchat/templates/prodromus.html | 4 +++- webchat/templates/tokens.html | 17 +++++++------- webchat/views.py | 26 +++++++++++---------- 7 files changed, 66 insertions(+), 57 deletions(-)