projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 421cb8b fbf3413)
Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 30 May 2016 20:58:49 +0000 (22:58 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 30 May 2016 20:58:49 +0000 (22:58 +0200)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

diff --cc .travis.yml
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)