It sait it needed merge

Merge branch 'features' of ALFRED/ALFRED into master
Roll a dice
2018-07-25 12:05:39 +02:00 · 2018-07-24 19:03:38 +00:00 · 2018-07-24 21:01:24 +02:00 · 2018-07-24 18:31:26 +00:00 · 2018-07-24 20:30:41 +02:00 · 2018-07-24 18:11:59 +00:00
2 changed files with 1 additions and 2 deletions
--- a/alfred.go
+++ b/alfred.go
@ -2,7 +2,7 @@
 * @Author: Bartuccio Antoine
 * @Date:   2018-07-23 15:24:22
 * @Last Modified by:   klmp200
-* @Last Modified time: 2018-07-24 20:55:53
+* @Last Modified time: 2018-07-25 12:04:44
 */

 package main
--- a/settings.json
+++ b/settings.json
@ -1,5 +1,4 @@
 {
-
 	"token": "INSERT TOKEN HERE",
 	"history size": 10,
 	"history file": "history.json",
Author	SHA1	Message	Date
Antoine Bartuccio	9b5c849dcc	It sait it needed merge the build failed Details	2018-07-25 12:05:39 +02:00
Antoine Bartuccio	5ba31d37cb	Merge branch 'features' of ALFRED/ALFRED into master the build was successful Details	2018-07-24 19:03:38 +00:00
Antoine Bartuccio	f5c77bff99	Roll a dice the build was successful Details	2018-07-24 21:01:24 +02:00
Antoine Bartuccio	4a1a904d65	Merge branch 'features' of ALFRED/ALFRED into master the build was successful Details	2018-07-24 18:31:26 +00:00
Antoine Bartuccio	a4354c3ee5	Can ask other people gender the build was successful Details	2018-07-24 20:30:41 +02:00
Antoine Bartuccio	abaf36c6e3	Merge branch 'features' of ALFRED/ALFRED into master the build was successful Details	2018-07-24 18:11:59 +00:00
Antoine Bartuccio	504b8cb5e6	Better word clean the build was successful Details	2018-07-24 20:10:16 +02:00
Antoine Bartuccio	7ec9a97b74	Merge branch 'features' of ALFRED/ALFRED into master the build was successful Details	2018-07-24 15:53:21 +00:00
Antoine Bartuccio	3128e836ea	Now use username to store user infos to go beyond Telegram Bot API limitation the build was successful Details	2018-07-24 17:52:04 +02:00
Antoine Bartuccio	62188a005d	Merge branch 'features' of ALFRED/ALFRED into master the build was successful Details	2018-07-24 15:32:41 +00:00
Antoine Bartuccio	1edf6ef81a	Less cancerous gender command the build was successful Details	2018-07-24 17:31:17 +02:00
Antoine Bartuccio	efa9b54ffa	Merge branch 'features' of ALFRED/ALFRED into master the build was successful Details	2018-07-24 13:25:25 +00:00
Antoine Bartuccio	7030d6d595	Add Users infos and gender registration the build was successful Details	2018-07-24 15:24:09 +02:00
Antoine Bartuccio	04ad6d33e7	Merge branch 'features' of ALFRED/ALFRED into master the build was successful Details	2018-07-24 10:58:50 +00:00
Antoine Bartuccio	85b52e23e5	Persistant history across reboots the build was successful Details	2018-07-24 12:57:31 +02:00
Antoine Bartuccio	7336770332	Externalized all commands in corresponding package the build was successful Details	2018-07-24 12:37:54 +02:00
Antoine Bartuccio	f7f3308372	Begin commands package the build was successful Details	2018-07-24 11:59:36 +02:00