vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'components' of https://github.com/pelonpelon/mithril.js into pelonpelon-components

Browse source 
Conflicts:
	docs/mithril.module.md
This commit is contained in:
Leo Horie 2015-03-06 17:13:47 -05:00
commit 57c199e2c6
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/mithril.module.md
View file

@ -104,7 +104,7 @@ m.module(document, module1);
var module2 = {};
module2.controller = function() {};
module1.view = function() {};
module2.view = function() {};
m.module(document, module2); // logs "unloading module 1"
```
@ -337,4 +337,4 @@ where:
- **returns Object controllerInstance**
An instance of the controller constructor