Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

World in conflict - slides and demo application #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

World in conflict - slides and demo application #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66b2845
Slides from world in conflict talk
Feb 24, 2014
3d28690
Demo application for the library whoed in workd in conflict
Feb 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@
[submodule "2013-02-21/workshop-slides"]
path = 2013-02-21/workshop-slides
url = https://github.com/mathbruyen/kissingturtles-handson
[submodule "2014-02-20/world-in-conflict"]
path = 2014-02-20/world-in-conflict
url = https://github.com/mathbruyen/nodejsconfit2014.git
[submodule "2014-02-20/mathsync-demoapp"]
path = 2014-02-20/mathsync-demoapp
url = https://github.com/mathbruyen/mathsync-demo.git
1 change: 1 addition & 0 deletions 2014-02-20/mathsync-demoapp
Open in desktop
Submodule mathsync-demoapp added at 85cb0f
1 change: 1 addition & 0 deletions 2014-02-20/world-in-conflict
Open in desktop
Submodule world-in-conflict added at 5fe03c