adding timezones to users #40
adding timezones to users #40
Move timezones into a constant
Merge branch 'add_timezones' of github.com:pxlpnk/rgsoc-teams into add_timezones

Conflicts:
	app/helpers/application_helper.rb
use am/pm for displaying the timezone
Use new ActiveRecord syntax
Bump gems
adding timezones to users #40
adding timezones to users #40
Merge pull request #48 from pxlpnk/add_timezones

Add timezones
use correct time format for timezones
make timezones uniqe
sort timezones
fix typo/reword [ci skip]
temporarily set disable_curb: true interacts with Feedzirra
This fixes n+1 Queries on the users page through joining the users roles, conferences and team roles.
Merge pull request #50 from beanieboi/bugfixes/slow-users-page

This fixes n+1 Queries on the users page.
adding gemnasium badge