Before merge with git upstream
This commit is contained in:
		
							parent
							
								
									d8d02ea5dc
								
							
						
					
					
						commit
						954a030f6a
					
				
							
								
								
									
										10
									
								
								Gemfile.lock
								
								
								
								
							
							
						
						
									
										10
									
								
								Gemfile.lock
								
								
								
								
							| 
						 | 
				
			
			@ -31,10 +31,19 @@ GEM
 | 
			
		|||
      terminal-table (~> 2.0)
 | 
			
		||||
    jekyll-feed (0.16.0)
 | 
			
		||||
      jekyll (>= 3.7, < 5.0)
 | 
			
		||||
    jekyll-paginate (1.1.0)
 | 
			
		||||
    jekyll-sass-converter (2.2.0)
 | 
			
		||||
      sassc (> 2.0.1, < 3.0)
 | 
			
		||||
    jekyll-seo-tag (2.8.0)
 | 
			
		||||
      jekyll (>= 3.8, < 5.0)
 | 
			
		||||
    jekyll-sitemap (1.4.0)
 | 
			
		||||
      jekyll (>= 3.7, < 5.0)
 | 
			
		||||
    jekyll-theme-basically-basic (1.4.5)
 | 
			
		||||
      jekyll (>= 3.6, < 5.0)
 | 
			
		||||
      jekyll-feed (~> 0.1)
 | 
			
		||||
      jekyll-paginate (~> 1.1)
 | 
			
		||||
      jekyll-seo-tag (~> 2.6)
 | 
			
		||||
      jekyll-sitemap (~> 1.3)
 | 
			
		||||
    jekyll-watch (2.2.1)
 | 
			
		||||
      listen (~> 3.0)
 | 
			
		||||
    kramdown (2.4.0)
 | 
			
		||||
| 
						 | 
				
			
			@ -78,6 +87,7 @@ DEPENDENCIES
 | 
			
		|||
  http_parser.rb (~> 0.6.0)
 | 
			
		||||
  jekyll (~> 4.2.2)
 | 
			
		||||
  jekyll-feed (~> 0.12)
 | 
			
		||||
  jekyll-theme-basically-basic
 | 
			
		||||
  minima (~> 2.5)
 | 
			
		||||
  tzinfo (~> 1.2)
 | 
			
		||||
  tzinfo-data
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										10
									
								
								_config.yml
								
								
								
								
							
							
						
						
									
										10
									
								
								_config.yml
								
								
								
								
							| 
						 | 
				
			
			@ -18,19 +18,17 @@
 | 
			
		|||
# You can create any custom variable you would like, and they will be accessible
 | 
			
		||||
# in the templates via {{ site.myvariable }}.
 | 
			
		||||
 | 
			
		||||
title: Your awesome title
 | 
			
		||||
email: your-email@example.com
 | 
			
		||||
title: Datat
 | 
			
		||||
email: hallitus@datat.fi
 | 
			
		||||
description: >- # this means to ignore newlines until "baseurl:"
 | 
			
		||||
  Write an awesome description for your new site here. You can edit this
 | 
			
		||||
  line in _config.yml. It will appear in your document head meta (for
 | 
			
		||||
  Google search results) and in your feed.xml site description.
 | 
			
		||||
baseurl: "" # the subpath of your site, e.g. /blog
 | 
			
		||||
url: "" # the base hostname & protocol for your site, e.g. http://example.com
 | 
			
		||||
twitter_username: jekyllrb
 | 
			
		||||
github_username:  jekyll
 | 
			
		||||
url: "https://datat.fi" # the base hostname & protocol for your site, e.g. http://example.com
 | 
			
		||||
instagram_username: datanurkka
 | 
			
		||||
 | 
			
		||||
# Build settings
 | 
			
		||||
theme: minima
 | 
			
		||||
plugins:
 | 
			
		||||
  - jekyll-feed
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
t:
 | 
			
		||||
  home: 'Datat'
 | 
			
		||||
| 
						 | 
				
			
			@ -4,3 +4,6 @@
 | 
			
		|||
 | 
			
		||||
layout: home
 | 
			
		||||
---
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Header 
 | 
			
		||||
		Loading…
	
		Reference in New Issue