Commit Graph

621 Commits

Author SHA1 Message Date
f60e17a83d remove htaccess debug mode (will be setup on apache configuration for the dev vhost) 2015-12-26 14:45:24 +01:00
8cd2ae071f Merge pull request #38 from gnieark/master
<->
2015-12-26 14:40:45 +01:00
f715642ae3 Merge pull request #37 from gnieark/dev
Update README.md
2015-12-26 12:29:46 +01:00
cf863f79c7 Update README.md 2015-12-26 12:29:02 +01:00
4b091fd8cc Merge branch 'dev' of github.com:gnieark/botsArena into dev 2015-12-25 20:40:59 +01:00
802bc799f1 readme 2015-12-25 20:40:47 +01:00
a8fc0ac7ff Update README.md 2015-12-25 20:40:05 +01:00
6f618b5574 Merge pull request #36 from gnieark/dev
Dev
2015-12-25 20:37:36 +01:00
814937937c Merge pull request #35 from gnieark/dev
Dev
2015-12-25 20:27:10 +01:00
059f268d76 install.sql 2015-12-25 20:26:35 +01:00
2487af0df8 Merge pull request #34 from gnieark/master
<->
2015-12-25 20:23:22 +01:00
8c00535ebd Merge branch 'master' of github.com:gnieark/botsArena
Conflicts:
	install.sql
2015-12-25 20:21:30 +01:00
0a4b65082c git push origin masterMerge branch 'dev' 2015-12-25 20:13:45 +01:00
014a83dd5b install.sql 2015-12-25 19:53:49 +01:00
f4f3a1f5e4 Merge pull request #32 from CamTosh/patch-1
Delete merge fail
2015-12-25 19:41:47 +01:00
Tosh Camille
9a2412351d Delete merge fail 2015-12-25 19:21:55 +01:00
628ed50cea plop 2015-12-25 19:17:48 +01:00
43cebbd6f5 legals 2015-12-25 19:14:45 +01:00
2481e88356 readme 2015-12-25 18:51:12 +01:00
d59249252f readme 2015-12-25 18:48:32 +01:00
da01e620fb Merge pull request #31 from gnieark/dev
readme
2015-12-25 18:46:26 +01:00
c38794c1df Merge pull request #30 from gnieark/dev
readme
2015-12-25 18:43:51 +01:00
a970943af5 Merge pull request #29 from gnieark/dev
css limit gif size, + responsive
2015-12-25 01:17:35 +01:00
84d43edef4 css limit gif size, + responsive 2015-12-25 01:16:31 +01:00
0cc23fd85e Merge pull request #28 from gnieark/dev
animation
2015-12-24 18:29:29 +01:00
79da420534 animation 2015-12-24 16:32:50 +01:00
0715852675 Merge pull request #27 from gnieark/dev
Dev
2015-12-24 16:05:47 +01:00
e8c2343373 animation 2015-12-24 16:00:59 +01:00
db89699ed9 animation 2015-12-24 16:00:01 +01:00
33dedcd991 animation 2015-12-24 15:58:45 +01:00
78cc818206 animation 2015-12-24 15:47:57 +01:00
79b4c00188 meta lang 2015-12-24 13:29:15 +01:00
dddda51a03 fix php parse error 2015-12-24 13:26:11 +01:00
307f828cb2 preparing site for translation home.php 2015-12-24 13:25:18 +01:00
d84186c793 home page 2015-12-21 20:02:47 +01:00
5ee00ef51a scroll down 2015-12-21 19:57:10 +01:00
6306592c1a css 2015-12-21 19:50:49 +01:00
4069636bc9 Delete htmllog.txt 2015-12-21 06:55:39 +01:00
68351dccfa kjhjklh 2015-12-21 06:53:14 +01:00
582ff05d56 specs 2015-12-20 19:56:37 +01:00
9405ed5bb3 specs 2015-12-20 19:54:34 +01:00
9bf97751c6 specs 2015-12-20 19:53:02 +01:00
a53303f279 specs 2015-12-20 19:45:54 +01:00
edaa05ab90 specs 2015-12-20 19:27:12 +01:00
d238121c34 specs 2015-12-20 19:25:21 +01:00
7e15b745ef specs 2015-12-20 19:10:20 +01:00
84bc996138 specs 2015-12-20 19:09:41 +01:00
6781bb78bd specs 2015-12-19 20:16:27 +01:00
ebb4324c4d specs 2015-12-19 20:16:02 +01:00
80dd978726 specs 2015-12-19 20:14:55 +01:00