Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.  | 
			||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| schema.rb | ||
| seeds.rb | ||
				
					
						
							Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.  | 
			||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| schema.rb | ||
| seeds.rb | ||