Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #4 from meso/tokyo

add Tokyo camp info

Conflicts:
	views/index/locations.jade
  • Loading branch information...
commit 5c7b49752100eeee97b621562d889010cd733a4d 2 parents 1a85000 + 3d4a753
@visnup visnup authored
Showing with 13 additions and 1 deletion.
  1. +13 −1 views/index/locations.jade
View
14 views/index/locations.jade
@@ -29,7 +29,6 @@
[let us know]: mailto:all@nodeknockout.com
ul.locations
-
li
h4#paris Paris, France
!= address('100 Rue de la folie mericourt, Paris, France')
@@ -41,6 +40,19 @@ ul.locations
[Joshfire]: http://www.joshfire.com/
+ li
+ h4#tokyo Tokyo, Japan
+ != address('東京都中央区日本橋浜町2丁目31−1', 'maps.google.co.jp')
+ :markdown
+ ### [Node.js日本ユーザグループ] and [ドワンゴ]
+ ##### 東京都中央区日本橋浜町2-31-1 浜町センタービル10F
+
+ Everybody welcome during whole knockout with free drinks. Contact [@meso].
+
+ [Node.js日本ユーザグループ]: http://nodejs.jp/
+ [ドワンゴ]: http://info.dwango.co.jp/
+ [@meso]: http://twitter.com/meso
+
// li
h4#nyc New York
!= address('902 Broadway 4th Floor, New York, NY, 10016')
Please sign in to comment.
Something went wrong with that request. Please try again.