some intial work on a splashier homepage
comment out since it is not clear if this is not implemented yet or obsolete
Other not so elegant way of detecting touch screen devices

But at least it seems to work
cleanup in preparation for new page
Merge branch 'master' of https://github.com/friendica/red into upstream
Merge branch 'upstream'
Merge pull request #302 from git-marijus/master

add a sanitized style tag to bbcode
Merge pull request #298 from cvogeley/master

Other not so elegant way of detecting touch screen devices
This would be about the 75th attempt to try and prevent duplicated email notifications for comments. Eventually we'll find something that works.
Merge https://github.com/friendica/red into zpull
fix auto-add of bookmarks to find sender correctly and optionally auto add bookmarks for self
cleanup - nothing more
allow bookmarks to use richtext
fix the xchan lookup tool
add chatroom links
add chatrooms template
this is basic but perhaps that's what we really need.
Merge branch 'newhomepage'
a couple more
Merge branch 'master' of https://github.com/friendica/red