Skip to content
This repository has been archived by the owner on Jun 7, 2022. It is now read-only.

[pull] master from laradock:master #19

Open
wants to merge 1,411 commits into
base: master
Choose a base branch
from

Conversation

pull[bot]
Copy link

@pull pull bot commented Aug 12, 2019

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Aug 12, 2019
@Mahmoudz Mahmoudz force-pushed the master branch 8 times, most recently from 600b7c6 to 308f813 Compare September 13, 2019 16:17
@Mahmoudz Mahmoudz force-pushed the master branch 2 times, most recently from dcab814 to 29def5f Compare February 7, 2020 22:10
@pull pull bot added the merge-conflict Resolve conflicts manually label Feb 19, 2020
@Mahmoudz Mahmoudz force-pushed the master branch 16 times, most recently from 7bbb1d7 to 5895afc Compare September 30, 2020 20:24
AliEbrahimpour and others added 23 commits July 1, 2024 17:51
add time zone for phpf-pm
…tar-6.2.1

build(deps): bump tar from 6.1.15 to 6.2.1 in /react
…ejs-3.1.10

build(deps): bump ejs from 3.1.8 to 3.1.10 in /react
…braces-3.0.3

build(deps): bump braces from 3.0.2 to 3.0.3 in /react
Workspace: add new aliases
Fix oracle instant client args from env
add timezone for php-worker
add   restart: always for all service
chore(jenkins): Update jdk and jenkins versions
* master:
  Update docker-compose.yml
  Update Dockerfile
  fix: mysql service exit
  chore(jenkins): Upgrade jdk and jenkins versions
  Fix Swoole 2
  Fix for bug #3535
  Update docker-compose.yml
  Update docker-compose.yml
  Fix swoole
  Fix oracle instant client args from env
  build(deps): bump braces from 3.0.2 to 3.0.3 in /react
  Workspace: add new aliases
  build(deps): bump ejs from 3.1.8 to 3.1.10 in /react
  build(deps): bump tar from 6.1.15 to 6.2.1 in /react
  add   restart: always for all service
@Mahmoudz Mahmoudz force-pushed the master branch 5 times, most recently from a425e01 to 30f8c80 Compare October 28, 2024 23:42
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.