Merge branch 'master' into resize-post-image-(like-footer-/-header)

dirkfabisch · Jan 8, 2016 · 76dea97 · 76dea97
2 parents e953112 + 0273a9f
commit 76dea97
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 # 'github-pages' includes 'jekyll' gem 
 gem 'github-pages'
 gem 'bourbon'
+gem 'jemoji'
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Getting Started
 ---
 - [Fork this repository](https://github.com/dirkfabisch/mediator)
 - Clone it: `git clone https://github.com/YOUR-USER/mediator`
-- Install the requried gems ([GitHub Pages](https://github.com/github/pages-gem), [Bourbon](https://github.com/thoughtbot/bourbon) and [Jekyll](https://github.com/jekyll/jekyll)): `bundle install`
+- Install the requried gems ([GitHub Pages](https://github.com/github/pages-gem), [Bourbon](https://github.com/thoughtbot/bourbon) and [Jekyll](https://github.com/jekyll/jekyll), [Jemoji](https://github.com/jekyll/jemoji)): `bundle install`
 - Run the jekyll server: `bundle exec jekyll serve`
 
 You should have a server up and running locally at <http://localhost:4000>.

diff --git a/_config.yml b/_config.yml
@@ -1,9 +1,8 @@
 # Build settings
-markdown: redcarpet
-highlighter: pygments
 gems:
   - jemoji
-
+  - jekyll-paginate
+
 # Site settings
 title: "Mediator"
 description: > # this means to ignore newlines until "email:"