snipe 1afef9416a Merge remote-tracking branch 'origin/develop' ... # Conflicts: # config/version.php		2016-12-03 17:15:02 -08:00
..
assets	Removed console message from JS	2016-08-01 21:43:56 -07:00
lang	Updated translations	2016-12-03 17:10:05 -08:00
macros	Allow certain users to override 2FA with permission	2016-10-31 16:52:25 -07:00
views	Merge remote-tracking branch 'origin/develop'	2016-12-01 06:10:50 -08:00