Merge branch 'server-time' of https://github.com/M2Ys4U/KiwiIRC into M2ys4U-server...
[KiwiIRC.git] / server / configuration.js
2013-09-17 DarrenMerge pull request #336 from M2Ys4U/userbox
2013-09-10 Andrew ColdenMerge branch 'pr/374' into notificationsMerge2
2013-08-18 Jack AllnuttMerge pull request #358 from M2Ys4U/buffer_parse
2013-08-15 DarrenMerge pull request #366 from coinpr0n/master
2013-08-15 DarrenMerge pull request #365 from coinpr0n/master
2013-08-10 DarrenMerge branch 'settings' into development
2013-08-10 DarrenMerge branch 'settings' of https://github.com/M2Ys4U...
2013-08-10 Jack AllnuttCache client settings, emit event on reconfig in config...
2013-06-01 Jack AllnuttMerge branch 'master' of github.com:prawnsalad/KiwiIRC
2013-05-25 Darrenmerging waldir-patch-1
2013-05-17 DarrenMerge branch 'master' into development
2013-05-16 DarrenMerge pull request #256 from ThiefMaster/patch-1
2013-05-16 ThiefMasterDon't use for..in for n array
2013-01-03 Jack AllnuttMerge branch 'master' of github.com:prawnsalad/KiwiIRC
2012-11-11 DarrenMerge branch 'ircv3' of https://github.com/M2Ys4U/KiwiI...
2012-11-11 DarrenMerged in lodash from karbassi
2012-11-10 DarrenMerge branch 'development'
2012-11-09 DarrenServer: Default config options during build
2012-11-02 Jack AllnuttMerge branch 'master' of github.com:prawnsalad/KiwiIRC
2012-11-02 DarrenMerge ... development branch (New server codebase)
2012-11-01 Jack AllnuttMerge branch 'backbone_ui' of github.com:prawnsalad...
2012-10-31 DarrenMerge branch 'backbone_ui' of https://github.com/M2Ys4U...
2012-10-31 Jack AllnuttUse explicit global variable for current configuration...
2012-10-28 DarrenDaemonize option and outputting to file
2012-10-22 DarrenGlobal config created, correct quit message. #94