ISPConfig3 devel
parent: 946704 | patch | commitdiff
Marius Burkard
2016-03-14 65c80f1a80caed31a3e9322a90b13577fe87496e
refs
author Marius Burkard <m.burkard@pixcept.de>
Monday, March 14, 2016 10:58 -0400
committer Marius Burkard <m.burkard@pixcept.de>
Monday, March 14, 2016 10:58 -0400
commit65c80f1a80caed31a3e9322a90b13577fe87496e
tree 432b3022569e5d56bc58fbaee3fbbe00b256fe37 tree | zip | gz
parent 9467043d926cf7c3aa4affd62c768bbf9dbd9685 view | diff
f5895d64b8302c03b66a13e79a7eeb5951f962fd view | diff 
Merge branch 'patch-1' into 'stable-3.1'

missing new line at the end of the line causes conflicts with the following line



See merge request !295
1 files modified
4 ■■■■■ changed files
server/conf/php_fpm_pool.conf.master 4 ●●●●● diff | view | raw | blame | history