Commit Graph

478 Commits

Author SHA1 Message Date
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
Flummi
1e95e22c1d cleanup 2016-11-07 02:28:40 +01:00
Flummi
a87015a31f bugfix 2016-11-07 02:18:31 +01:00
Flummi
0826223d5c bugfix 2016-11-07 02:15:08 +01:00
Flummi
948fd4e647 new configsystem 2016-11-07 02:02:02 +01:00
sirx
74b6c99295 animiert icons sehen in chromium scheiße aus 2016-11-06 03:40:02 +01:00
sirx
fb5823fcbb s vergessen 2016-11-06 03:21:36 +01:00
sirx
989dcd57de animiertes eygon 2016-11-06 03:14:18 +01:00
noxy
8ada3fa294 Merge branch 'f0ckdev' into 'master'
besseres eygon

See merge request !30
2016-11-06 02:05:51 +00:00
sirx
f0c7726a47 besseres eygon 2016-11-06 03:02:13 +01:00
noxy
144077d541 Merge branch 'f0ckdev' into 'master'
neues bilt :-DdDdDd

100 brozent ned geklaud

See merge request !29
2016-11-06 01:58:57 +00:00
sirx
d5f5e77218 skalarwelle 2016-11-06 02:57:58 +01:00
sirx
f7604a3abc neues feveygon 2016-11-06 02:54:28 +01:00
noxy
c67b7daf65 Merge branch 'f0ckdev' into 'master'
js fehler figsen

See merge request !28
2016-11-06 01:35:45 +00:00
sirx
5204cfd2ad hab mal auf fluhmey gehörd 2016-11-06 02:34:48 +01:00
noxy
bfa3eff305 Update shit.js 2016-11-06 01:31:49 +00:00
sirx
319cda0274 fix volume null error mamer 2016-11-06 02:30:15 +01:00
noxy
698fd313f9 Merge branch 'f0ckdev' into 'master'
sory mamer

See merge request !27
2016-11-06 01:27:23 +00:00
sirx
3766e02f65 sory mamer 2016-11-06 02:26:30 +01:00
noxy
11b96d9ffc Merge branch 'f0ckdev' into 'master'
hab aufgereumt mamer

See merge request !26
2016-11-06 01:22:27 +00:00
sirx
ebfebc6e09 sgroller 2016-11-06 02:20:18 +01:00
sirx
1429ea56d5 Merge branch 'f0ckdev' of https://gitfap.de/keinBot/keinBotv2 into f0ckdev 2016-11-06 02:13:15 +01:00
Flummi
573567337e Merge branch 'master' into 'f0ckdev'
Master

See merge request !25
2016-11-06 01:12:58 +00:00
Flummi
ff00f148d7 Merge branch 'f0ckdev' into 'master'
Jugendsünden sind doof

See merge request !24
2016-11-06 01:11:56 +00:00
sirx
77450a379a kot aufräumen 2016-11-06 02:11:53 +01:00
Flummi
c7a2a19713 Delete theme.js 2016-11-06 01:11:14 +00:00
Flummi
191c463de9 Delete cyber.css 2016-11-06 01:11:05 +00:00
noxy
95c3c781e9 Merge branch 'f0ckdev' into 'master'
shautaut an stefan

stefanlinugs dange für das skribt und so waita nech

See merge request !23
2016-11-06 01:08:32 +00:00
sirx
b35a45f55b shautaut an stefan 2016-11-06 02:07:28 +01:00
noxy
e4c1bc2410 Merge branch 'f0ckdev' into 'master'
F0ckdev

neus design

See merge request !22
2016-11-06 00:22:52 +00:00
sirx
41179d8b4c wird nich besser :D 2016-11-06 01:19:55 +01:00
sirx
30dbd53ecc bin müde xD 2016-11-06 01:16:20 +01:00
sirx
a134279a47 blah 2016-11-06 01:10:09 +01:00
sirx
74d3a96373 gumbo 2016-11-06 01:03:42 +01:00
sirx
eaa87c5ce6 neues design term 2016-11-06 00:56:41 +01:00
noxy
70d60c58c4 Merge branch 'f0ckdev' into 'master'
F0ckdev

belst ist ein schwuli und jetzt sehen die how to und contact seite auch noch gut aus :3

See merge request !21
2016-11-05 18:26:16 +00:00