Merge branch 'hotfix/updates' into develop

This commit is contained in:
Michael Rose 2013-07-16 15:40:32 -04:00
commit 26f380e863
5 changed files with 18 additions and 20 deletions

View file

@ -1,30 +1,30 @@
title: So Simple Theme
description: A simple and clean responsive Jekyll theme for words and photos.
title: Site Title
description: Describe your website here.
logo: site-logo.png
disqus_shortname: sosimpletheme
disqus_shortname:
#Comment out url when working locally to resolve base urls correctly
url: http://mmistakes.github.io/so-simple-theme
url: http://your-website.com
# Owner/author information
owner:
name: Michael Rose
avatar: michael-rose-photo.jpg
email: michael@mademistakes.com
name: Your Name
avatar: bio-photo.jpg
email: you@email.com
# Social networking links used in footer. Update and remove as you like.
twitter: "mmistakes"
facebook: "michaelrose"
github: "mmistakes"
linkedin: "michaelrose"
instagram: "mmistakes"
tumblr: "mademistakes"
twitter:
facebook:
github:
linkedin:
instagram:
tumblr:
# For Google Authorship https://plus.google.com/authorship
google_plus: "http://plus.google.com/118238196859537351707"
google_plus:
# Analytics and webmaster tools stuff goes here
google_analytics: UA-2011187-2
google_verify: UQj93ERU9zgECodaaXgVpkjrFn9UrDMEzVamacSoQ8Y
google_analytics:
google_verify:
# https://ssl.bing.com/webmaster/configure/verify/ownership Option 2 content= goes here
bing_verify: D81F4C18A6CB3018F64D7C827D953DFD
bing_verify:
# Links to include in top navigation
# For external links add external: true

View file

@ -45,6 +45,4 @@ Fingerstache thundercats Williamsburg, deep v scenester Banksy ennui vinyl selfi
Occupy et selvage squid, pug brunch blog nesciunt hashtag mumblecore skateboard yr kogi. Ugh small batch swag four loko. Fap post-ironic qui tote bag farm-to-table american apparel scenester keffiyeh vero, swag non pour-over gentrify authentic pitchfork. Schlitz scenester lo-fi voluptate, tote bag irony bicycle rights pariatur vero Vice freegan wayfarers exercitation nisi shoreditch. Chambray tofu vero sed. Street art swag literally leggings, Cosby sweater mixtape PBR lomo Banksy non in pitchfork ennui McSweeney's selfies. Odd Future Banksy non authentic.
Aliquip enim artisan dolor post-ironic. Pug tote bag Marfa, deserunt pour-over Portland wolf eu odio intelligentsia american apparel ugh ea. Sunt viral et, 3 wolf moon gastropub pug id. Id fashion axe est typewriter, mlkshk Portland art party aute brunch. Sint pork belly Cosby sweater, deep v mumblecore kitsch american apparel. Try-hard direct trade tumblr sint skateboard. Adipisicing bitters excepteur biodiesel, pickled gastropub aute veniam.
[^1]: Texture image courtesty of [Lovetextures](http://www.lovetextures.com/)
Aliquip enim artisan dolor post-ironic. Pug tote bag Marfa, deserunt pour-over Portland wolf eu odio intelligentsia american apparel ugh ea. Sunt viral et, 3 wolf moon gastropub pug id. Id fashion axe est typewriter, mlkshk Portland art party aute brunch. Sint pork belly Cosby sweater, deep v mumblecore kitsch american apparel. Try-hard direct trade tumblr sint skateboard. Adipisicing bitters excepteur biodiesel, pickled gastropub aute veniam.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB