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

1e0e0bce

Commit 1e0e0bce authored 14 years ago by maxwell

Downloads
- Plain Diff

fixing merge with master

parents 2f6a11f0 ea7abccd

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile 1 addition, 0 deletions

Gemfile
spec/spec_helper.rb 2 additions, 2 deletions

spec/spec_helper.rb

with 3 additions and 2 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