Lin Jen-Shin (godfat) 0e5ee119b7 Merge branch 'master' into '25680-CI_ENVIRONMENT_URL' ... # Conflicts: # db/schema.rb		2017-05-26 19:18:25 +00:00
..
assets	More consistent padding of notes, system notes, and note form	2017-05-26 19:01:42 +00:00
controllers	Merge branch 'dm-consistent-last-push-event' into 'master'	2017-05-26 16:14:30 +00:00
finders	Create a Users Finder	2017-05-15 13:53:12 +00:00
helpers	Merge branch 'dm-consistent-last-push-event' into 'master'	2017-05-26 16:14:30 +00:00
mailers	Bugfix: Always use the default language when generating emails.	2017-05-25 10:22:45 -05:00
models	Merge branch 'master' into '25680-CI_ENVIRONMENT_URL'	2017-05-26 19:18:25 +00:00
policies	Merge branch 'snippets-finder-visibility' into 'security'	2017-05-10 16:48:18 +02:00
presenters	Fix conflict resolution from corrupted upstream	2017-05-12 20:47:51 +01:00
serializers	Remove route	2017-05-19 10:12:02 -03:00
services	Merge branch 'master' into '25680-CI_ENVIRONMENT_URL'	2017-05-26 19:18:25 +00:00
uploaders	…
validators	Revert "Remove changes that are not absolutely necessary"	2017-05-24 20:59:26 +00:00
views	More consistent padding of notes, system notes, and note form	2017-05-26 19:01:42 +00:00
workers	Merge branch 'issue_19262' into 'master'	2017-05-25 18:59:35 +00:00