* remotes/upstream/master:
slackr - tone down the shadows a smidgin
add plugin hooks to gender, sexpref, and marital selectors
birthday in november,december bug
rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by.
handle multiple underscores in D* links
projects / friendica.git / commitdiff