Merge branch 'master' into stable

nylas · May 19, 2016 · 5ecc277 · 5ecc277
2 parents d1fa9fd + 60632b5
commit 5ecc277
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,6 @@
   + On Windows, installing the update no longer displays a dialog "`app-0.4.X` is a folder."
   + Undoing and then redoing many operations now works as expected.
   + When removing accounts, N1 focuses the remaining accounts properly.
-  + The templates
   + N1 no longer fails to quit in some scenarios.
   + N1 is now ~60MB smaller and launches faster thanks to proper precompiling of assets.
   + Spellcheck now runs faster.

diff --git a/src/pro b/src/pro