Merge branch 'fosscord:master' into master
This commit is contained in:
		
						commit
						e89a2ee2f1
					
				| @ -9,12 +9,10 @@ export const ActivitySchema = { | ||||
| 			type: Number, | ||||
| 			$url: String, | ||||
| 			$created_at: Date, | ||||
| 			$timestamps: [ | ||||
| 				{ | ||||
| 					$start: Number, | ||||
| 					$end: Number, | ||||
| 				}, | ||||
| 			], | ||||
| 			$timestamps: { | ||||
| 				$start: Number, | ||||
| 				$end: Number, | ||||
| 			}, | ||||
| 			$application_id: String, | ||||
| 			$details: String, | ||||
| 			$state: String, | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Madeline
						Madeline