Tags: amdshrif/atom

Merge remote-tracking branch 'origin/stable' into beta

Conflicts:
	package.json

1.2.3

Merge branch 'stable' into beta

Merge pull request atom#9681 from atom/mb-fix-dock-icon-click

Avoid using deprecated 'activate-with-no-open-windows' event

1.3.0-beta3

Fix specs. Duh.

1.2.1

1.3.0-beta0

1.2.0

1.2.0-beta3