github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-17 14:42:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	app/Http/Controllers/Api/SystemController.php
#	resources/assets/sass/pages/components/dialog-wrapper.scss
This commit is contained in:
韦荣超 2022-02-25 10:57:28 +08:00
commit 3066631301
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/php/php.conf
View File

@ -2,10 +2,10 @@
directory=/var/www directory=/var/www
# 生产环境 # 生产环境
command=php bin/laravels start -i #command=php bin/laravels start -i
# 开发环境 # 开发环境
#command=./bin/inotify ./app command=./bin/inotify ./app
numprocs=1 numprocs=1
autostart=true autostart=true

1
resources/assets/sass/pages/components/dialog-wrapper.scss vendored
View File

@ -93,7 +93,6 @@
margin-top: 4px; margin-top: 4px;
padding-top: 1px padding-top: 1px
} }
} }
.sub-title { .sub-title {