Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

php7-fpm
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

9c20b2f9

Commit 9c20b2f9 authored 8 years ago by nimrod

Downloads
- Plain Diff

Merge branch 'master' of /home/nimrod/Documents/Shore/Ansible/example

# Conflicts:
#	meta/main.yml

parents fa8d683f bfd73ee7

Branches

No related tags found

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

.travis.yml 1 addition, 0 deletions

.travis.yml
meta/main.yml 1 addition, 1 deletion

meta/main.yml
molecule.yml 1 addition, 1 deletion

molecule.yml
tasks/main.yml 1 addition, 1 deletion

tasks/main.yml
tests/requirements.txt 1 addition, 1 deletion

tests/requirements.txt
tox.ini 2 additions, 3 deletions

tox.ini

with 7 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment