Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/3.4-dev' into 3.4-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
meinemitternacht committed Jul 6, 2016
2 parents c317762 + bc6a22b commit ca50923
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "includes/fontAwesome"]
path = includes/fontAwesome
url = https://github.com/FortAwesome/Font-Awesome.git
[submodule "minify"]
path = minify
url = https://github.com/mrclay/minify.git

0 comments on commit ca50923

Please sign in to comment.