From 3994b82f78e54733405263b4e04db1ee4345d023 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 15 Apr 2014 10:53:59 +0200
Subject: [PATCH] Bump travis-core and use master branch

---
 Gemfile      | 2 +-
 Gemfile.lock | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index ef8eb92e..2267514f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ ruby '2.0.0'
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core', branch: 'ps-settings-encryption'
+gem 'travis-core',     github: 'travis-ci/travis-core'
 gem 'travis-support',  github: 'travis-ci/travis-support'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
 gem 'sinatra'
diff --git a/Gemfile.lock b/Gemfile.lock
index 86683817..31b00d76 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,8 +23,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: e9e0b02da4c63a2cc0846275df1a819944e9311a
-  branch: ps-settings-encryption
+  revision: d2a19ee99f543eb2db376390847b682caa960b7f
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.12)