Merge branch 'master' into access
Conflicts: config/default.toml
This commit is contained in:
		
						commit
						115d254baf
					
				
					 33 changed files with 2331 additions and 61 deletions
				
			
		| 
						 | 
				
			
			@ -53,7 +53,7 @@
 | 
			
		|||
    </style>
 | 
			
		||||
</head>
 | 
			
		||||
 | 
			
		||||
<body class="{{#if user}}logged-in user-{{user.username}}{{/if}}">
 | 
			
		||||
<body class="{{bodyClass}}">
 | 
			
		||||
 | 
			
		||||
    <nav class="navbar navbar-default navbar-static-top">
 | 
			
		||||
        <div class="container">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue