projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4d37244) | patch
Merge remote-tracking branch 'refs/remotes/origin/2.1'
authorMarcel Werk <burntime@woltlab.com>
Sat, 8 Apr 2017 11:58:06 +0000 (13:58 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 8 Apr 2017 11:58:06 +0000 (13:58 +0200)
commite3b0902b3759065f32a1d858be69d4249e50ad88
tree94821beeefb394437bd48f1a97ad4cb6038b2bfftree | snapshot (tar.gz zip)
parent4d37244e789af980c89cbb52d87f51a5504d22c0commit | diff
Merge remote-tracking branch 'refs/remotes/origin/2.1'

# Conflicts:
# com.woltlab.wcf/templates/register.tpl
com.woltlab.wcf/templates/register.tpl diff | blob | blame | history
WoltLab Suite Core (previously WoltLab Community Framework)