From c3f46dc66bff8ed7641a7cf7ddbff4eafb183779 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 28 Oct 2014 08:28:32 -0400 Subject: [PATCH 1/3] Update VERSION --- VERSION | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 165c730..72a75ed 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,10 @@ -v0.2.5 +v0.2.6 Changelog - * Markdown support in comments - * Cursor on default input field - * Show app version - + * Settings Updates + * Choose to hide items on filter + * Ability to turn off modal animations + * Choose boards when creating a user + * Comments can be edited + * Opening login page redirects to boards if a valid token is found From 01cf708f99f50cc56ba6961697b818c1cf7c10bd Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 28 Oct 2014 08:30:30 -0400 Subject: [PATCH 2/3] Rollback VERSION update - wrong branch again. --- VERSION | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 72a75ed..8e27bef 100644 --- a/VERSION +++ b/VERSION @@ -1,10 +1,7 @@ -v0.2.6 +v0.2.5 Changelog - * Settings Updates - * Choose to hide items on filter - * Ability to turn off modal animations - * Choose boards when creating a user - * Comments can be edited - * Opening login page redirects to boards if a valid token is found + * Markdown support in comments + * Cursor on default input field + * Show app version From 66ed4a8bced713cf8653023debdf43cf9bb4421f Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 10 Nov 2014 21:33:02 -0500 Subject: [PATCH 3/3] Update VERSION --- VERSION | 7 ------- 1 file changed, 7 deletions(-) diff --git a/VERSION b/VERSION index 3e2c625..8d0c9d6 100644 --- a/VERSION +++ b/VERSION @@ -2,16 +2,9 @@ v0.2.6 Changelog -<<<<<<< HEAD * Settings Updates * Choose to hide items on filter * Choose boards when creating/editing a user * Comments can be edited * Dates show up on comments and attachments without reload * Opening login page redirects to boards if a valid token is found - -======= - * Markdown support in comments - * Cursor on default input field - * Show app version ->>>>>>> master