Feliciaan De Palmenaer
|
4c94953059
|
Hopefully lets werkzeug log
|
2015-04-02 21:01:18 +02:00 |
|
James
|
f12c7b4849
|
Merge branch 'master' of github.com:ZeusWPI/James
|
2015-04-02 13:00:03 +02:00 |
|
James
|
acc389082b
|
Put things like they were
|
2015-04-02 12:59:55 +02:00 |
|
Feliciaan De Palmenaer
|
43b8a4f028
|
Merge branch 'master' of github.com:ZeusWPI/Foodbot
|
2015-04-02 12:56:38 +02:00 |
|
Feliciaan De Palmenaer
|
16b630854a
|
maybe fixes it
|
2015-04-02 12:56:15 +02:00 |
|
James
|
24c5da72f6
|
Merge branch 'master' of github.com:ZeusWPI/James
Conflicts:
app/app.py
app/james.py
|
2015-04-02 12:47:11 +02:00 |
|
James
|
6eb310199a
|
Do stuff on server
|
2015-04-02 12:45:38 +02:00 |
|
Feliciaan De Palmenaer
|
aa7f916979
|
Merge branch 'master' of github.com:ZeusWPI/Foodbot
Conflicts:
app/app.py
app/james.py
|
2015-04-02 12:42:39 +02:00 |
|
Feliciaan De Palmenaer
|
7ce3642ef8
|
Added logging
|
2015-04-02 12:41:19 +02:00 |
|
James
|
6cb9bf067f
|
This is really going to hurt
|
2015-03-31 20:15:22 +02:00 |
|
Tom Naessens
|
76f7d4c56d
|
Some PEP8, remove insecure_lib
|
2015-03-31 16:29:28 +02:00 |
|
Feliciaan De Palmenaer
|
5677986378
|
Foodbot is dead, long live James
|
2015-03-31 00:06:09 +02:00 |
|