Jordan Wright 080b3a6c27 Merge branch 'table-style' of https://github.com/StrangeUSB/gophish into StrangeUSB-table-style ... # Conflicts: # static/js/app/campaigns.js # static/js/app/dashboard.js # static/js/app/landing_pages.js # static/js/app/templates.js # static/js/app/users.js		2016-01-20 21:53:12 -06:00
..
bootstrap	Changed color to #283F50. Fixes #52	2016-01-06 20:44:30 -06:00
css	Merge branch 'table-style' of https://github.com/StrangeUSB/gophish into StrangeUSB-table-style	2016-01-20 21:53:12 -06:00
db	Added IP, Lat and Lon to models.Result. Closes #47	2016-01-04 00:04:10 -06:00
font	Changing primary font from "Lato" to "Source Sans Pro/Roboto"	2015-09-25 19:49:40 -05:00
images	Changed color to #283F50. Fixes #52	2016-01-06 20:44:30 -06:00
js	Merge branch 'table-style' of https://github.com/StrangeUSB/gophish into StrangeUSB-table-style	2016-01-20 21:53:12 -06:00