Commit Graph

613 Commits

Author SHA1 Message Date
Flummi
f3280092e0 lel 2016-11-22 16:59:28 +01:00
Flummi
ba246d672d bulkdel 2016-11-22 16:58:06 +01:00
Flummi
5ffb07c14c WIP: cfgzeugs 2016-11-22 07:02:40 +01:00
Flummi
a291e4f0a1 muh 2016-11-22 06:26:12 +01:00
Flummi
a6495dd213 WIP: cfgtrigger 2016-11-21 19:05:02 +01:00
Flummi
bdd4ef7b95 muh 2016-11-21 07:31:19 +01:00
Flummi
d15281703c muh 2016-11-21 07:30:40 +01:00
Flummi
66916456f0 Merge branch 'f0ckdev' into 'master'
Coffea der Hurensohn

See merge request !45
2016-11-20 19:29:22 +00:00
Flummi
298f3ec687 muh 2016-11-20 20:27:55 +01:00
Flummi
7538a98640 muh 2016-11-20 20:25:21 +01:00
Flummi
f209ddf05b fixed part 2016-11-20 20:21:25 +01:00
noxy
8e5bf0c4a0 Merge branch 'f0ckdev' into 'master'
F0ckdev

kaltes css :3

See merge request !44
2016-11-19 09:50:44 +00:00
sirx
123b575fe6 xd 2016-11-19 10:49:36 +01:00
sirx
bcfd11a3c4 dunkles blau :3 2016-11-19 10:47:37 +01:00
Flummi
d7cbf32533 Merge branch 'f0ckdev' into 'master'
default values

See merge request !43
2016-11-19 06:47:01 +00:00
Flummi
4acff5016a default values 2016-11-19 07:46:08 +01:00
Flummi
9528d30c61 Merge branch 'f0ckdev' into 'master'
F0ckdev

See merge request !42
2016-11-19 05:36:25 +00:00
Flummi
b2e8119155 channeltrigger toggable 2016-11-19 06:33:59 +01:00
Flummi
e53573c28a shit 2016-11-18 08:16:58 +01:00
Flummi
d998cfb26d shit 2016-11-18 08:14:35 +01:00
Flummi
17b014c650 fix 2016-11-18 07:57:36 +01:00
Flummi
92c4e2ae36 muh 2016-11-18 07:56:12 +01:00
Flummi
cd97c2938c triggertest 2016-11-18 06:32:55 +01:00
Flummi
6611559b26 triggertest 2016-11-18 06:30:38 +01:00
Flummi
a85e018d33 Merge branch 'f0ckdev' into 'master'
autism™

See merge request !41
2016-11-17 06:01:19 +00:00
Flummi
2af6dfb63d autism die zweite 2016-11-17 07:00:12 +01:00
Flummi
bb7eda3a1a autism die erste 2016-11-17 06:55:05 +01:00
noxy
4a050b5575 Merge branch 'f0ckdev' into 'master'
Schönheitsoperation [Insert Botox]

See merge request !40
2016-11-15 13:19:15 +00:00
sirx
1349872ec5 Schönheitsoperation [Insert Botox] 2016-11-15 14:18:15 +01:00
noxy
9ae334a8e8 Merge branch 'f0ckdev' into 'master'
<br> nach timestamp

See merge request !39
2016-11-15 13:13:19 +00:00
sirx
f463c8e224 <br> nach timestamp 2016-11-15 14:12:43 +01:00
noxy
22aa0f2df7 Merge branch 'f0ckdev' into 'master'
neuer texd für stats

See merge request !38
2016-11-07 18:47:31 +00:00
sirx
ccb1923bde neuer texd für stats 2016-11-07 19:39:18 +01:00
Flummi
4f16e4ad1c Merge branch 'f0ckdev' into 'master'
update readme

See merge request !37
2016-11-07 15:09:33 +00:00
Flummi
0e1cb416aa update readme 2016-11-07 16:08:23 +01:00
Flummi
815cfcc842 Merge branch 'f0ckdev' into 'master'
rm-alias

See merge request !36
2016-11-07 13:31:26 +00:00
Flummi
81b0de2858 rm-alias 2016-11-07 14:29:15 +01:00
Flummi
c25c4bb80c Merge branch 'f0ckdev' into 'master'
improved deletefunction

See merge request !35
2016-11-07 13:25:56 +00:00
Flummi
17217f4506 improved deletefunction 2016-11-07 14:24:33 +01:00
Flummi
515e758c81 Merge branch 'f0ckdev' into 'master'
ups.

See merge request !34
2016-11-07 02:02:58 +00:00
Flummi
f4d2b09f07 ups 2016-11-07 03:02:12 +01:00
Flummi
303d6ccc3d Merge branch 'f0ckdev' into 'master'
+quickfick

See merge request !33
2016-11-07 01:52:21 +00:00
Flummi
e0ff84187b moar mimetypes! 2016-11-07 02:50:17 +01:00
Flummi
dda1c587e9 add mov 2016-11-07 02:44:44 +01:00
Flummi
3cd8601082 more verbose 2016-11-07 02:41:17 +01:00
Flummi
ee0018ff89 Merge branch 'f0ckdev' into 'master'
delete configs

See merge request !32
2016-11-07 01:36:24 +00:00
Flummi
5839a5b6b0 Delete main.json 2016-11-07 01:36:06 +00:00
Flummi
8cc163f3fc Delete websrv.json 2016-11-07 01:36:00 +00:00
Flummi
aa29feb761 Delete irc.json 2016-11-07 01:35:52 +00:00
Flummi
4fab49e884 Merge branch 'f0ckdev' into 'master'
new configsystem

See merge request !31
2016-11-07 01:30:03 +00:00