Skip to content
Snippets Groups Projects
Commit da693964 authored by Imran Hussain's avatar Imran Hussain
Browse files

Merge remote-tracking branch 'upstream/master' into redesign 

Conflicts:
	static/About/Room-secondary.txt
	static/About/Room.txt
	templates/head.tpl
	templates/index.tpl
parents 3d386b9c c5966e6f
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 169 additions and 2621 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment