Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
rapicastillo committed Jul 17, 2017
2 parents 1bb9d2f + 882565e commit a0a3c4d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
port: 4000
markdown: kramdown
name: Prog Hacknight
url: http://proghacknight.org
url: http://www.progressivehacknight.org
title: Prog Hacknight
description: "Progressive HackNight is a bi-weekly gathering of coders and creatives, makers and doers, to foment and inspire action. We use our collective talents and abilities to push forward pro-social change in benefit of the common good."
encoding: utf-8
Expand Down
3 changes: 1 addition & 2 deletions culture.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
---
layout: default
title: Culture
redirect_from:
- /culture/index.html
redirect_from: /culture/
description: "All the things you need to get started with hacknight!"
---

Expand Down

0 comments on commit a0a3c4d

Please sign in to comment.