Skip to content
Commit 8746967a authored by Omar's avatar Omar
Browse files

Merge branch '6.x.x' of github.com:omarusman/talk into 6.x.x 

 Conflicts:
	js/app.js
	js/merged.json
parents c8b867f4 f5430888
Expand all Hide whitespace changes
Inline Side-by-side
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