]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '1.0.x' into limitdist
authorEvan Prodromou <evan@status.net>
Wed, 23 Mar 2011 19:58:27 +0000 (15:58 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 23 Mar 2011 19:58:27 +0000 (15:58 -0400)
commiteb1faa78658669bff57288ff48a4af4aa1a89c1b
tree55cb22057db9ea79c7f6d78e829ab12f7703912a
parentfd8dad39633870d2d71c3829a756e724acb45c2a
parent2b901894c2c14f3e7e1c3eae8960f8a3c09310a0
Merge branch '1.0.x' into limitdist

Conflicts:
classes/Notice.php
classes/Notice.php
classes/Profile.php