Devin Howard 77e8716588 Merge branch 'master' into develop		2016-08-07 17:23:57 +08:00
..
assets	Merge branch 'master' into develop	2016-08-07 17:23:57 +08:00
controllers	remove duplicates from synapse search	2016-07-31 19:31:31 +08:00
helpers	Update code style automatically using rubocop gem (#563)	2016-07-26 08:14:23 +08:00
mailers	Update code style automatically using rubocop gem (#563)	2016-07-26 08:14:23 +08:00
models	Update code style automatically using rubocop gem (#563)	2016-07-26 08:14:23 +08:00
policies	hotfix master with mappable_policy.try	2016-08-04 17:04:01 +08:00
serializers	Update code style automatically using rubocop gem (#563)	2016-07-26 08:14:23 +08:00
services	Update code style automatically using rubocop gem (#563)	2016-07-26 08:14:23 +08:00
views	move metacode loading earlier, and add a query string to work around amazon aws CORS issues	2016-08-03 08:54:10 +08:00