Skip to content

Commit

Permalink
Merge pull request #107 from diasdavid/master
Browse files Browse the repository at this point in the history
Adding LXJS to the flock :)
  • Loading branch information
gergelyke committed Mar 2, 2014
2 parents aeddd4d + 18aa390 commit 9cfd08e
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ send a pull request.*
* *Jun 2th* **Stuttgart, Germany** [Pferdle-JavaScript Meetup](http://www.meetup.com/stuttgartjs/)
* *Jun 19th* **Saint Louis, MO, USA** [STLJS: CanJS — Build Better Apps, Faster](http://www.meetup.com/STL-JS-meetup/events/159770032/)
* *Jun 24th-27th* **Portland, OR, USA** [OSBridge](http://opensourcebridge.org/)
* *Jun 27th-28th* **Lisbon, Portugal, Europe** [LXJS - Lisbon Javascript Conference](http://lxjs.org)

### July 2014
* *Jul 4th Weekend* **Marin County, CA, USA** [NodeConf 2014](http://www.nodeconf.com)
Expand Down

0 comments on commit 9cfd08e

Please sign in to comment.