]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - actions/emailsettings.php
Merge branch 'runtime' into testing
authorEvan Prodromou <evan@status.net>
Mon, 31 Jan 2011 19:02:17 +0000 (14:02 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 31 Jan 2011 19:02:17 +0000 (14:02 -0500)
commitadaad5bb5ea45c7647f5c1de881881861d85ae39
tree039428d77be4f3b2777075b1e0e1062fa0cbb451
parentea4ebe280ac486b21ed2f2f24ca363bbaf45fa60
parentca4bf541310eb36fae5a69697bba76a2211218f4
Merge branch 'runtime' into testing