From: Alexander Ebert Date: Wed, 6 Apr 2016 10:18:40 +0000 (+0200) Subject: Merge remote-tracking branch 'refs/remotes/origin/session' into next X-Git-Tag: 3.0.0_Beta_1~1968 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9ed6686c24479a21450c2d8b5c981cb9a1899a7a;p=GitHub%2FWoltLab%2FWCF.git Merge remote-tracking branch 'refs/remotes/origin/session' into next # Conflicts: # wcfsetup/install/files/lib/data/session/Session.class.php # wcfsetup/install/files/lib/data/session/virtual/SessionVirtual.class.php --- 9ed6686c24479a21450c2d8b5c981cb9a1899a7a