Merge remote-tracking branch 'origin/develop' into test
This commit is contained in:
		
						commit
						9d1346ef3b
					
				
					 1 changed files with 1 additions and 1 deletions
				
			
		
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							|  | @ -132,7 +132,7 @@ sync_test_db_aggressive: | |||
| 	bash -c "psql mam_test <<< 'DROP OWNED BY \"mam-web\";'" | ||||
| 	pg_restore -c --if-exists -d mam_test dump-prod.sql | ||||
| 	rm dump-prod.sql | ||||
| 	bash -c "psql mam_test <<< UPDATE django_site SET name=\'MaMweb (test)\', domain=\'mam-test.ks.matfyz.cz\' WHERE id=1" | ||||
| 	psql mam_test -c "UPDATE django_site SET name='MaMweb (test)', domain='mam-test.ks.matfyz.cz' WHERE id=1" | ||||
| 	@echo Done. | ||||
| 
 | ||||
| # Sync test with production
 | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue