Skip to content
Browse files

Merge remote-tracking branch 'linus/patch-1'

Conflicts:
	views/index/locations.jade
  • Loading branch information...
2 parents a8c3452 + 09c530a commit ba14588560eb6bb68a3686b54df400c0ef374776 Visnu Pitiyanuvath committed Jul 28, 2011
Showing with 18 additions and 1 deletion.
  1. +18 −1 views/index/locations.jade
View
19 views/index/locations.jade
@@ -188,6 +188,23 @@ ul.locations
| .
li
+ h4#stockholm Stockholm, Sweden
+ - address = escape('Birger Jarlsgatan 18, 114 34, Stockholm, Sweden')
+ a( href='http://maps.google.com/maps?q=' + address )
+ img.map( src='http://maps.googleapis.com/maps/api/staticmap?center=' + address + '&zoom=15&size=226x140&sensor=false&markers=size:small|' + address )
+ h3
+ a( href: 'http://hanssonlarsson.se/' ) Hansson & Larsson Internet AB
+ h5
+ | Birger Jarlsgatan 18A, 5 tr
+ br
+ | 114 34 Stockholm
+ p
+ | Everybody welcome during the knockout. We will provide coffee and beer.
+ | Contact
+ a( href: 'http://twitter.com/yesbabyyes' ) @yesbabyyes
+ | with any questions.
+
+ li
h4#tokyo Tokyo, Japan
- address = escape('東京都港区芝浦1丁目14−6')
a( href='http://maps.google.co.jp/maps?q=' + address )
@@ -213,4 +230,4 @@ ul.locations
| Roncade Treviso
p Contact
a( href: 'http://twitter.com/johnnyaboh' ) @johnnyaboh
- .
+ .

0 comments on commit ba14588

Please sign in to comment.
Something went wrong with that request. Please try again.