comment out since it is not clear if this is not implemented yet or obsolete
Merge branch 'master' of https://github.com/friendica/red into upstream
Merge branch 'upstream'
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red into upstream
Merge branch 'master' of https://github.com/friendica/red into upstream
Merge branch 'master' of https://github.com/friendica/red into upstream
Merge branch 'master' of https://github.com/friendica/red into upstream
let oneself be added to a collection in exchange for deleted contacts
Merge branch 'upstream'
Merge pull request #304 from git-marijus/master

let oneself be added to a collection in exchange for deleted contacts
from olivier: use double quotes in js strings, updated FR translation
from me: provide future ability to have an optional edit link/icon next to menus (such as bookmarks)
Merge https://github.com/friendica/red into zpull
fix issue with double linkify in the git feed
set default for account_level in DB
make bookmarks message into an 'info' so it expires and goes away after a bit
create a new "subdued" CSS class for things that shouldn't be in your face unless you want them and intentionally hover over them. Typically this would be accomplished via an opacity or colour change, but themes are free to use other methods. Also changed the channel_tabs "chatroom" link to use the subdued class if no rooms have been created rather than a count of chatrooms. Themse should probably create a .subdued and .subdued:hover definition because we'll probably take most of the stuff which is now hardwired to use opacity by id and change it to use the class definition instead.
Pass mids to conv_item template
Merge pull request #305 from beardy-unixer/master

Pass mids to conv_item template