]> git.mxchange.org Git - friendica.git/commit - mods/sample-nginx.config
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 1 Dec 2013 23:33:46 +0000 (00:33 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 1 Dec 2013 23:33:46 +0000 (00:33 +0100)
commite0cf2c5167f29efcd8923f40bade346fe44c4ef3
tree453c29c69f8e46226283e98d98a914da6dfa757a
parent6684107b66c9413f5d79290e097a63b4569c57d3
parentacd29f22a0615ec70f7966f57b4b9ebbbadca668
Merge remote-tracking branch 'upstream/master'

Conflicts:
mod/admin.php
mod/settings.php
boot.php
mod/admin.php
mod/settings.php