emberjs/website — pull request #1658 by mattmarcum (2014-08-14 21:36:15+00:00)
Title: Ember dallas

Fixed the merge conflict from the previous PR

Added Ember Dallas meetup entry to data/meetups.yml