Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream changes #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upstream changes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92d4648
Updated copyright year
andrew Jan 26, 2013
3291286
Gem updates
andrew Feb 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 17 additions & 27 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,28 @@
GEM
remote: http://rubygems.org/
specs:
addressable (2.2.6)
faraday (0.7.5)
addressable (~> 2.2.6)
multipart-post (~> 1.1.3)
rack (>= 1.1.0, < 2)
faraday_middleware (0.7.0)
faraday (~> 0.7.3)
haml (3.1.3)
hashie (1.1.0)
json (1.6.1)
multi_json (1.0.3)
multi_xml (0.4.1)
multipart-post (1.1.3)
rack (1.3.5)
rack-protection (1.1.4)
faraday (0.8.5)
multipart-post (~> 1.1)
haml (3.1.7)
json (1.7.6)
multi_json (1.5.0)
multipart-post (1.1.5)
rack (1.5.2)
rack-protection (1.3.2)
rack
sass (3.1.10)
sass (3.2.5)
shotgun (0.9)
rack (>= 1.0)
simple_oauth (0.1.5)
sinatra (1.3.1)
rack (~> 1.3, >= 1.3.4)
rack-protection (~> 1.1, >= 1.1.2)
simple_oauth (0.2.0)
sinatra (1.3.4)
rack (~> 1.4)
rack-protection (~> 1.3)
tilt (~> 1.3, >= 1.3.3)
tilt (1.3.3)
twitter (1.7.2)
faraday (~> 0.7.4)
faraday_middleware (~> 0.7.0)
hashie (~> 1.1.0)
multi_json (~> 1.0.0)
multi_xml (~> 0.4.0)
simple_oauth (~> 0.1.5)
twitter (4.5.0)
faraday (~> 0.8, < 0.10)
multi_json (~> 1.0)
simple_oauth (~> 0.2)

PLATFORMS
ruby
Expand Down
4 changes: 2 additions & 2 deletions README.textile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ I can talk about what ever you like, just edit or override my <code>speak</code>

h2. License

Copyright (c) 2008 Andrew Nesbitt
Copyright (c) 2013 Andrew Nesbitt

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -42,4 +42,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.