Fixed merge conflicts

2026-02-28 04:03:12 +08:00 · 2021-07-30 18:19:32 +02:00
parent dbc50b6d4f b3af493758
commit db93498ee6
5 changed files with 37 additions and 6 deletions
--- a/docker/config/php.ini
+++ b/docker/config/php.ini
@@ -1,3 +1,4 @@
 log_errors_max_len=0
 zend.assertions=1
 assert.exception=1
+memory_limit=256M