kosmos/chef
kosmos/chef
8
3
Fork 0
Code Issues 29 Pull Requests 2 Projects 2 Activity

WIP: Set up ejabberd for kosmos.org #24

Closed
greg wants to merge 25 commits from feature/7-ejabberd_rebased into master
pull from: feature/7-ejabberd_rebased
merge into: kosmos:master
Conversation 6 Commits 25 Files Changed 71 -4
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3047dbe99f - Show all commits

4
Berksfile.lock
View File

@ -114,11 +114,7 @@ GRAPH
hostsfile (2.4.5)
iis (6.7.1)
windows (>= 2.0)
<<<<<<< HEAD
ipfs (0.1.2)
raucao commented 2019-03-19 16:03:27 +00:00
Outdated
Review
Copy Link

Missed a merge conflict.

Missed a merge conflict.
=======
ipfs (0.1.1)
>>>>>>> 591c746... Update the ipfs cookbook
ark (>= 0.0.0)
logrotate (2.2.0)
mariadb (0.3.1)