19 Commits

Author	SHA1	Message	Date
SECURED.ORG	13b965e6fa	Merge branch 'master' into master	2017-12-11 13:51:46 -08:00
SECURED.ORG	13b4d0b1ed	Merge branch 'master' into master	2017-12-11 13:48:46 -08:00
Aljaz Ceru	1918c0797a	Update list.json	2017-12-11 22:23:49 +01:00
xcellardoor	aa9bf944a8	Added some UK Conferences	2017-12-11 21:13:48 +00:00
Pierre LALET	370aeda12b	Add GreHack	2017-12-11 21:59:36 +01:00
SECURED.ORG	d46f257100	Update list.json	2017-12-11 12:54:17 -08:00
Brian Baskin	3b73429ac1	Proposed clean-up ... Tabs to whitespaces, normalizes each line (rm spaces around quotes), basic cleanup. Just a proposition, if you like this style.	2017-12-11 15:41:16 -05:00
SECURED.ORG	fc39e52423	Update list.json	2017-12-11 12:33:15 -08:00
Brian Baskin	1ad1b2177e	Added BSidesCharm -- because it's totes ab fab	2017-12-11 14:53:45 -05:00
SECURED.ORG	250b4b20fa	Update list.json	2017-12-11 11:40:54 -08:00
SECURED.ORG	da6ea057d9	Update list.json	2017-12-11 11:37:43 -08:00
SECURED.ORG	b6c65b252a	Update search.html	2017-12-11 11:27:23 -08:00
SECURED.ORG	d1bfc96642	Update list.json	2017-12-11 11:22:53 -08:00
SECURED.ORG	b5443f4048	Update list.json	2017-12-11 11:21:19 -08:00
SECURED.ORG	c5d518e956	Update list.json	2017-12-11 11:11:01 -08:00
SECURED.ORG	fceabce4a6	Update list.json	2017-12-11 11:10:43 -08:00
Amanda Rousseau	635d858645	adding conf	2017-12-11 11:08:09 -08:00
Amanda Rousseau	c4105e4256	adding conf	2017-12-11 11:04:40 -08:00
Amanda Rousseau	34dfe785a8	adding community conf search	2017-12-11 10:57:42 -08:00