From 139b37d5a021ed05b228e7936e345bc105f61abf Mon Sep 17 00:00:00 2001
From: Muhammad Herdiansyah <herdiansyah@openmailbox.org>
Date: Sun, 25 Dec 2016 19:02:26 +0700
Subject: [PATCH] Docs: CHANGELOG

---
 CHANGELOG.md | 1 +
 neofetch     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b881f61..71c30fbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,6 +89,7 @@ Neofetch now has an irc channel at `#neofetch` on Freenode. If you have any ques
 - Renamed `get_birthday()` -- > `get_install_date()`
 - Removed all `date` usage from `get_install_date()`.
 - Added a new function called `convert_time()` which takes the time stamped `ls` output and converts it to a pretty format. The function only uses bash so its much faster than calling `date`. This makes things simple and keeps the output consistent across all Operating Systems. Example: `2016-12-06 16:58:58.000000000` --> `Tue 06 Dec 2016 4:58 PM`
+- Added an option so users can choose between using 24-hour and 12-hour time format
 
 **Disk**<br \>
 
diff --git a/neofetch b/neofetch
index d464f195..18e00983 100755
--- a/neofetch
+++ b/neofetch
@@ -3065,7 +3065,7 @@ convert_time() {
                 *) time="$((hour - 12))${min} PM" ;;
             esac
         ;;
-        *) time="${hour}${min}" ;;
+        *) time="$4" ;;
     esac
 
     # Toggle showing the time.