Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

diaspora
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

f07bcb19

Commit f07bcb19 authored 14 years ago by Alec Leamas

Downloads
- Plain Diff

Merge remote branch 'upstream/master'

parents 993e5613 acc9c116

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile 1 addition, 0 deletions

Gemfile
Gemfile.lock 31 additions, 0 deletions

Gemfile.lock
chef/cookbooks/bootstrap/bootstrap.json 1 addition, 0 deletions

chef/cookbooks/bootstrap/bootstrap.json
chef/cookbooks/bootstrap/recipes/default.rb 9 additions, 0 deletions

chef/cookbooks/bootstrap/recipes/default.rb
chef/cookbooks/main/main.json 1 addition, 0 deletions

chef/cookbooks/main/main.json
chef/cookbooks/main/recipes/default.rb 3 additions, 0 deletions

chef/cookbooks/main/recipes/default.rb

with 46 additions and 0 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