Files
atom/vendor
Kevin Sawicki 56a2c79fe1 Merge branch 'collaboration-presence' into shared-buffers
Conflicts:
	src/app/edit-session.coffee
	src/app/project.coffee
	src/app/text-buffer.coffee
	src/app/window.coffee
	src/packages/collaboration/lib/bootstrap.coffee
	src/packages/collaboration/lib/session-utils.coffee
	vendor/telepath
2013-07-22 10:12:45 -07:00
..
2013-07-12 14:07:03 -07:00
2013-01-22 12:39:40 -08:00
2012-10-26 10:58:10 -07:00
2013-02-01 14:13:56 -08:00