Merge remote-tracking branch 'hoatle/blog_how_to_blog_octopress_teracy-dev' into develop
Merge remote-tracking branch 'hoatle/blog_how_to_blog_octopress_teracy-dev' into develop
Merge remote-tracking branch 'hoatle/blog_how_to_blog_octopress_teracy-dev' into develop
Hot fix on [blog]: how to start blogging easily with octopress and teracy-dev
Initial setup
Initial work
Update installation approach to avoid conflict
Add default values specified by octopress-facebook-like, rename facebook_like_replace.html > facebook_like_box.html
Merge branch 'develop'
Merge remote-tracking branch 'hoatle-octopress-facebook-like-box/master' into feature_9_add_fb_like_box
Add Facebook like-box: octopress-facebook-like installation [#9]
Add Facebook like-box: octopress-facebook-like configuration [#9]
Merge remote-tracking branch 'hoatle/feature_9_add_fb_like_box' into develop
Merge remote-tracking branch 'origin/develop'
[blog] how to add facebook-like-box to octopress [#9]
Merge remote-tracking branch 'hoatle/blog_how_to_add_facebook_like_box_to_octopress' into develop
Merge branch 'develop'
[blog] how to add Facebook like-box to octopress: add except[#9]
Merge remote-tracking branch 'hoatle/blog_how_to_add_facebook_like_box_to_octopress' into develop
Merge remote-tracking branch 'origin/develop'