Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2025-01-20 23:39:56 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Matej Kramny 2015-03-25 11:06:26 +00:00
parent c638774f7a
commit 970f0d4f10
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -95,11 +95,7 @@ Use these variables to override the config.
- Be able to specify environment information per playbook / per task - Be able to specify environment information per playbook / per task
- Schedule jobs - Schedule jobs
- Email alerts - Email alerts
<<<<<<< HEAD
>>>>>>> 1199a52... Update site layout
=======
- Multiple user support - Multiple user support
>>>>>>> 7282f8a... Improve readme & Dockerfile
## Note to Ansible guys ## Note to Ansible guys