Skip to content
GitLab
Commit 158a2394 authored by Julian Thilo's avatar Julian Thilo
Browse files

Merge branch 'master' of https://github.com/twbs/bootstrap

parents 8d903fbd c42b6a3f
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
+1 -1
LICENSE
+ 1
- 1
View file @ 158a2394
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2014 Twitter, Inc Copyright (c) 2011-2014 Twitter, Inc
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
......
Supports Markdown
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