Kamil Trzciński a653c8ead4 Merge branch 'master' into 'backstage/gb/rename-ci-cd-processing-sidekiq-queues' ... # Conflicts: # db/schema.rb		2017-08-25 12:10:53 +00:00
..
fixtures	Move GitHooksService to Gitlab::Git	2017-08-23 10:45:20 +02:00
migrate	Merge branch 'revert-appearances-description-html-not-null' into 'master'	2017-08-25 10:13:31 +00:00
post_migrate	Merge branch 'master' into 'backstage/gb/rename-ci-cd-processing-sidekiq-queues'	2017-08-25 12:10:53 +00:00
schema.rb	Re-allow appearances.description_html to be NULL	2017-08-24 18:33:32 +02:00
seeds.rb