Skip to content

Commit

Permalink
Merge branch 'base'
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
  • Loading branch information
roncli committed Feb 26, 2015
2 parents 2867f72 + 1831a74 commit 2163c22
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,11 @@ The following should be the contents of privateConfig.js:
Version History
===============

0.4
---

This version implements the music section, which links to SoundCloud. Included are comments, RSS feeds for the music and each individual tag, and an administration section. Music pages also double as HTML pages, meaning that if you create a page with the same URL as a music page, that HTML will display on the page along with the music.

0.3.1
-----

Expand Down Expand Up @@ -169,11 +174,6 @@ This version introduces the bare bones of the website, including the layout, Twi
Planned Versions
================

0.4
---

* Implement Music section.

0.5
---

Expand Down
2 changes: 1 addition & 1 deletion roncli.com/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "roncli.com",
"version": "0.3.1",
"version": "0.4.0",
"description": "The website for roncli.com.",
"homepage": "https://github.com/roncli/roncli.com",
"bugs": {
Expand Down

0 comments on commit 2163c22

Please sign in to comment.