hace 2 años · de4a7cb943
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,22 @@ composer.lock
 
				 .env.php
			
 
				 .DS_Store
			
 
				 Thumbs.db
			
 
				+<<<<<<< Updated upstream
			
 
				 app/database/csv/*
			
 
				 app/config/local/*
			
 
				+=======
			
 
				+
			
 
				+
			
 
				+app/storage/annual_pdfs/*
			
 
				+public/exports/*
			
 
				+
			
 
				+node_modules/
			
 
				+vendor/*
			
 
				+!vendor/barryvdh/
			
 
				+!vendor/dompdf/
			
 
				+
			
 
				+app/controllers/AuthController.php
			
 
				+app/controllers/AuthController.php
			
 
				+bootstrap/start.php
			
 
				+testdisk.log
			
 
				+>>>>>>> Stashed changes