Skip to content

Commit 66e2f89

Browse files
authored
Merge pull request #28 from OS2web/develop
1.0.10-rc9
2 parents 0ee1e58 + 321be51 commit 66e2f89

File tree

16 files changed

+1668
-1013
lines changed

16 files changed

+1668
-1013
lines changed

.docker/os2web/php/os2web-php.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
memory_limit=512M
2+
max_execution_time = 120

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
"os2web/os2web_meetings_sbsys": "dev-master",
7676
"os2web/os2web_news": "dev-master",
7777
"os2web/os2web_pagebuilder": "dev-master",
78+
"os2web/os2web_person_information": "dev-master",
7879
"os2web/os2web_search": "dev-master",
7980
"os2web/os2web_spotbox": "dev-master",
8081
"vlucas/phpdotenv": "^4.0",

0 commit comments

Comments
 (0)