Commit Graph

13 Commits

Author SHA1 Message Date
c5bfbc387f Auto stash before merge of "master" and "devel" 2018-02-28 20:45:16 +01:00
969159a525 Revert "Merge remote-tracking branch 'origin/devel' into devel"
This reverts commit dde5a98698.
2018-02-15 02:03:05 +01:00
5e5419d2be Revert "Merge branch 'devel' into origin/master"
This reverts commit 34ce297e7c1ff524cb39ee97e415cd53f624a94d.
2018-02-15 00:57:32 +01:00
ebe635acd9 Adding connection on navbar 2018-02-13 16:31:57 +01:00
60543a8626 Somme edit heroku 2017-12-12 01:14:26 +01:00
983678f656 it is time to welcome............... Spring!!!!! 2017-12-12 01:06:58 +01:00
BrokenFire
167c0e9472 Change .gitignore 2017-11-05 22:25:55 +01:00
BrokenFire
9baff049b9 Remove bot token to prevent leak... 2017-11-05 15:11:31 +01:00
BrokenFire
ffb8fe914b Adding Music ! 2017-10-22 23:48:13 +02:00
99dbd8b784 Edit .gitignore 2017-02-01 14:04:58 +01:00
7f22e641ea Change .gitignore 2017-02-01 14:01:04 +01:00
Sebastien Clement
a42d115724 ignore out/ 2016-12-08 20:14:16 +01:00
BrokenFire
bf00e9ef23 Initial commit 2016-12-08 19:22:25 +01:00