]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - lib/framework.php
Merge branch 'utf8mb4' into nightly
authorMikael Nordfeldth <mmn@hethane.se>
Thu, 19 Feb 2015 19:50:40 +0000 (20:50 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Thu, 19 Feb 2015 19:50:40 +0000 (20:50 +0100)
commit0590f2975e6c5b26bbe6121da5c49890e035721e
treeb75792b533e28e7f260913bac91cb5747bb2c10a
parent5471c65c9a2c4a721fe30a6e384ee4f1d0578477
parent2f86cd860231f92213950d439e9a109b7a5f11c4
Merge branch 'utf8mb4' into nightly

Conflicts because of urlhash fixes:
classes/File.php
classes/File_redirection.php
classes/File_thumbnail.php
classes/File.php
classes/File_thumbnail.php
classes/Profile.php
classes/Subscription.php
classes/User.php
extlib/DB.php
plugins/Blog/classes/Blog_entry.php
plugins/OStatus/classes/Ostatus_profile.php