]> git.mxchange.org Git - friendica.git/commit - mods/sample-nginx.config
Merge branch 'master' of https://github.com/annando/friendica
authorMichael - piratica.eu <ike@piratenpartei.de>
Sun, 20 Jan 2013 13:17:09 +0000 (14:17 +0100)
committerMichael - piratica.eu <ike@piratenpartei.de>
Sun, 20 Jan 2013 13:17:09 +0000 (14:17 +0100)
commitcc9ce39e3f1d7335de2124f78c5ecb02becd197c
tree522e02e78719823caf4fa10fd056cbbbfb8e0c0d
parent7ab335c9d620779c929d80cac3d083f183dba391
parent4e3d0018c69eaaa122f004357c5c68dacef59fc7
Merge branch 'master' of https://github.com/annando/friendica

Conflicts:
include/poller.php
include/diaspora.php
include/poller.php