Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/hufyhang/microjs.com into…
Browse files Browse the repository at this point in the history
… hufyhang-master

Conflicts:
	atom.xml
	data-min.js
	data.js
  • Loading branch information
SimonWaldherr committed Dec 6, 2014
2 parents c2879d9 + a9a81d2 commit 8802d46
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions data.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ module.exports = [
url: "https://github.com/srijs/muject",
source: "https://raw.githubusercontent.com/srijs/muject/master/index.js"
},
{
name: "Chop.js",
github: "hufyhang/chop",
tags: ["mvc framework", "mvc", "framework", "templating", "DOM", "routing"],
description: "A Super Light-Weight JavaScript Framework",
url: "https://github.com/hufyhang/chop",
source: "https://raw.githubusercontent.com/hufyhang/chop/master/chop.js"
},
{
name: "Mithril",
github: "lhorie/mithril",
Expand Down

0 comments on commit 8802d46

Please sign in to comment.