Conflicts:
	package.json
This commit is contained in:
Julian Lam
2014-08-28 21:05:15 -04:00
parent ad00c3cb50
commit fa545c5bfd

View File

@@ -2,7 +2,7 @@
"name": "nodebb",
"license": "GPLv3 or later",
"description": "NodeBB Forum",
"version": "0.5.0-2",
"version": "0.5.0-4",
"homepage": "http://www.nodebb.org",
"repository": {
"type": "git",