Jordan Wright 6b61b24f68 Merge branch 'master' into 78-store-smtp-settings ... # Conflicts: # models/models_test.go # static/js/app/landing_pages.js		2016-02-28 22:08:39 -06:00
..
bootstrap	Changed color to #283F50. Fixes #52	2016-01-06 20:44:30 -06:00
css	Merge branch '124-capture-passwords'	2016-02-25 20:04:48 -06:00
db	Added IP, Lat and Lon to models.Result. Closes #47	2016-01-04 00:04:10 -06:00
font	Upgrading Font-Awesome to 4.5. Closes #101	2016-01-29 09:36:25 -06:00
images	Changed color to #283F50. Fixes #52	2016-01-06 20:44:30 -06:00
js	Merge branch 'master' into 78-store-smtp-settings	2016-02-28 22:08:39 -06:00
gophish_user_guide.pdf	Added current version of user guide to local content. This should be kept in sync with features of the local gophish version	2016-02-20 17:23:58 -06:00