]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/SearchSub/locale/de/LC_MESSAGES/SearchSub.po
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a18d3fa b4ecb24)
Merge branch '1.0.x' into 1.1.x
authorEvan Prodromou <evan@status.net>
Wed, 16 Nov 2011 17:00:13 +0000 (12:00 -0500)
committerEvan Prodromou <evan@status.net>
Wed, 16 Nov 2011 17:00:13 +0000 (12:00 -0500)
commitf519858044a627e99244b334b7bef3f7f96fa317
tree9315e5cecd32c281eb9dddb78414ec3f5def9d86tree | snapshot
parenta18d3facf8767419e699adefcfea2081c220185fcommit | diff
parentb4ecb249070803b0600b2c1c100e80ca53e942cacommit | diff
Merge branch '1.0.x' into 1.1.x

Conflicts:
lib/framework.php
lib/framework.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)