Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:lab2023/hierapolis into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
coskuntekin committed Jun 14, 2013
2 parents a221df3 + 4b1b2f1 commit 215962c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# If you have OpenSSL installed, we recommend updating
# the following line to use "https"
source 'http://rubygems.org'
source 'https://rubygems.org'

gem 'middleman', '~>3.0.14'
gem 'middleman-livereload', '~> 3.0.1'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GEM
remote: http://rubygems.org/
remote: https://rubygems.org/
specs:
activesupport (3.2.13)
i18n (= 0.6.1)
Expand Down

0 comments on commit 215962c

Please sign in to comment.