From: Simon <simon@kisikew.org>
Date: Tue, 6 Mar 2012 21:20:20 +0000 (-0800)
Subject: Merge pull request #95 from simonlnu/master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=073241a77a678062ad01f12a1218c0cc5e7fcbaf;p=friendica.git

Merge pull request #95 from simonlnu/master

styling fixes in dispy; typos fixed in settings.tpl
---

073241a77a678062ad01f12a1218c0cc5e7fcbaf