Commit Graph

839 Commits

Author SHA1 Message Date
Flummi
7d2ffcd60e muh 2017-03-22 14:03:10 +01:00
Flummi
a22b82ccbd muh 2017-03-22 14:01:26 +01:00
Flummi
b6e9b9c40d muh 2017-03-22 13:58:23 +01:00
Flummi
a6930add23 muh 2017-03-22 03:07:59 +01:00
Flummi
72df37f103 Merge branch 'f0ckdev' into 'master'
need coffee plox

See merge request !99
2017-03-22 02:02:04 +00:00
Flummi
c8f9969ce4 need coffee plox 2017-03-22 03:01:37 +01:00
Flummi
5665aa48fd Merge branch 'f0ckdev' into 'master'
mrhankypower

See merge request !98
2017-03-22 01:59:38 +00:00
Flummi
95f0076b52 mrhankypower 2017-03-22 02:59:16 +01:00
Flummi
b087b2312d Merge branch 'f0ckdev' into 'master'
mrhankypower

See merge request !97
2017-03-22 01:57:46 +00:00
Flummi
343e915749 mrhankypower 2017-03-22 02:57:10 +01:00
Flummi
8ec9ea7b2a Merge branch 'f0ckdev' into 'master'
Flummi = doof

See merge request !96
2017-03-22 00:48:46 +00:00
Flummi
3ce187279b Flummi = doof 2017-03-22 01:48:00 +01:00
Flummi
aaf49d6ca7 Flummi = doof 2017-03-22 01:46:31 +01:00
Flummi
f7f2f6d7ed Flummi = doof 2017-03-22 01:40:09 +01:00
Flummi
032aad5bb9 Merge branch 'f0ckdev' into 'master'
F0ckdev

See merge request !95
2017-03-22 00:35:56 +00:00
Flummi
b182fd2a3f ups 2017-03-22 01:34:47 +01:00
Flummi
3b020f9503 in, not in 2017-03-22 01:33:57 +01:00
Flummi
0de61065d9 Merge branch 'f0ckdev' into 'master'
slice > splice

See merge request !94
2017-03-22 00:09:07 +00:00
Flummi
4ae71df64b slice > splice 2017-03-22 01:05:14 +01:00
Flummi
bf3eaa1689 Merge branch 'f0ckdev' into 'master'
es6 yay

See merge request !93
2017-03-21 23:54:01 +00:00
Flummi
aa36f5bcd4 debuggsen 2017-03-22 00:53:18 +01:00
Flummi
ea2e9b1f4b Merge branch 'f0ckdev' into 'master'
ups.

See merge request !92
2017-03-21 23:38:22 +00:00
Flummi
0331b53d76 debuggsen 2017-03-22 00:37:43 +01:00
Flummi
5f0e05dc75 Merge branch 'f0ckdev' into 'master'
rand by user

See merge request !91
2017-03-21 23:32:38 +00:00
Flummi
d52e4249a1 debuggsen 2017-03-22 00:31:30 +01:00
Flummi
8c99039312 debuggsen 2017-03-22 00:28:44 +01:00
Flummi
0dd192bdb6 muh 2017-03-22 00:27:19 +01:00
Flummi
c530db8959 muh 2017-03-22 00:12:26 +01:00
Flummi
36da6b94fc muh 2017-03-22 00:11:18 +01:00
Flummi
e9471f85df test xD 2017-03-22 00:10:26 +01:00
Flummi
83702a0873 Merge branch 'f0ckdev' into 'master'
f0ckrandom

See merge request !90
2017-03-20 19:20:26 +00:00
Flummi
2b9204dea6 f0ck-random, yay 2017-03-20 20:17:03 +01:00
Flummi
dbe7125ac8 bullshit -.- 2017-03-16 10:08:51 +01:00
Flummi
5cb531706c test 2017-03-16 10:02:35 +01:00
Flummi
b0cb9080fa test 2017-03-16 10:01:18 +01:00
Flummi
d649e15476 test 2017-03-16 09:57:08 +01:00
Flummi
46e8c94814 Merge branch 'f0ckdev' into 'master'
blah

See merge request !89
2017-03-15 10:57:24 +00:00
Flummi
4571f95c54 blah 2017-03-15 11:56:54 +01:00
Flummi
219eb6286f Merge branch 'f0ckdev' into 'master'
fix level < 0

See merge request !88
2017-03-15 10:42:40 +00:00
Flummi
8630395dfb fix level < 0 2017-03-15 11:39:54 +01:00
Flummi
be37a79908 Merge branch 'f0ckdev' into 'master'
maxfilesize * 2 for Admins

See merge request !87
2017-03-15 10:33:36 +00:00
Flummi
02d4c60d8d fuck 2017-03-15 11:29:14 +01:00
Flummi
0f64a25ae7 fuck 2017-03-15 11:23:07 +01:00
Flummi
28fa0b2d6b fuck 2017-03-15 11:18:53 +01:00
Flummi
668de1ffbb maxfilesize * 2 fuer Admins 2017-03-15 11:12:51 +01:00
Flummi
e250cc7a48 Merge branch 'f0ckdev' into 'master'
restarttrigger

See merge request !86
2017-02-09 08:04:28 +00:00
Flummi
fa04110438 restarttrigger 2017-02-09 09:03:01 +01:00
noxy
8be84239a7 Merge branch 'f0ckdev' into 'master'
Random Button auf index seite

See merge request !85
2017-02-05 10:20:41 +00:00
noxy
0c533e61ff Update index.tpl.html 2017-02-05 10:19:48 +00:00
noxy
0a37c18b53 Merge branch 'f0ckdev' into 'master'
fixed nav

See merge request !84
2017-02-04 10:35:16 +00:00