| 
							
							
								 Benjamin Myara | c67849c3dc | del | 2018-08-31 15:06:42 +01:00 |  | 
			
				
					| 
							
							
								 Beatrice Olivera | 0b377cbe20 | fixed calling modal | 2018-08-31 11:29:24 +01:00 |  | 
			
				
					| 
							
							
								 Beatrice Olivera | 4fdc56ca5c | Merge branch 'master' into brand | 2018-08-31 10:33:38 +01:00 |  | 
			
				
					| 
							
							
								 Benjamin Myara | 81ed01010c | done brand | 2018-08-31 10:17:26 +01:00 |  | 
			
				
					| 
							
							
								 Beatrice Olivera | a900959c34 | Merge branch 'master' into page | 2018-08-30 20:09:00 +01:00 |  | 
			
				
					| 
							
							
								 Benjamin Myara | 6dee298b44 | Add dotenv - Protect my secret data in .env file | 2018-08-29 14:53:39 +01:00 |  | 
			
				
					| 
							
							
								 Beatrice Olivera | 085e402c4d | created models for chatroom | 2018-08-29 13:44:10 +01:00 |  | 
			
				
					| 
							
							
								 Beatrice Olivera | 82079d71cd | removed room id from connections table | 2018-08-29 13:15:37 +01:00 |  | 
			
				
					| 
							
							
								 Beatrice Olivera | 97aee2c10f | added room id to connections table | 2018-08-29 11:39:51 +01:00 |  | 
			
				
					| 
							
							
								 Beatrice Olivera | f9cbb7c680 | created channel for action cable and friendship relationship in database | 2018-08-27 16:56:21 +01:00 |  | 
			
				
					| 
							
							
								 Beatrice Olivera | ebd896cd31 | Initial commit with devise template from https://github.com/lewagon/rails-templates | 2018-08-27 15:37:06 +01:00 |  |