Permalink
Browse files

# Conflicts:

#	class.atkcontroller.inc
#	doc/CHANGES
#	ext/font-awesome/css/font-awesome.css
#	ext/font-awesome/fonts/fontawesome-webfont.svg
#	ext/font-awesome/fonts/fontawesome-webfont.ttf
#	menu/class.atksmartmenu.inc
#	menu/smartmenus/css/sm-custom.css
#	src/Resources/public/fonts/font-awesome/fontawesome-webfont.svg
#	src/Resources/public/fonts/font-awesome/fontawesome-webfont.ttf
#	src/Resources/src/sass/_stuff.scss
#	themes/bootstrap/lib/font-awesome-4.2.0/fonts/fontawesome-webfont.svg
#	themes/bootstrap/lib/font-awesome-4.2.0/fonts/fontawesome-webfont.ttf
#	themes/bootstrap/styles/style.css
#	themes/steelblue/styles/recordlist.css
#	themes/steelblue/styles/style.css
#	themes/steelblue/themedef.inc
#	ui/class.atkthemecompiler.inc
  • Loading branch information...
1 parent 5f916cd commit 32a798c774582a8641c16a10dea5d1ce3ace6266 @michelerota michelerota committed Mar 9, 2016
Showing 2,872 changed files with 99,766 additions and 273,653 deletions.
View
@@ -1,55 +1,5 @@
-# Linux
-# backup files
-*~
-
-# Windows
-# thumbnails
-Thumbs.db
-
-# Mac OS X
-# metadata
+.idea
.DS_Store
-# thumbnails
-._*
-
-# Visual Studio PHP
-*.sln
-*.phpproj
-*.puo
-*.suo
-*.cache
-
-# Netbeans
-nbproject/
-catalog.xml
-nbactions.xml
-
-# Eclipse
-.settings/
-.buildpath
-.classpath
-.project
-
-# SVN
-# svn folders
-.svn/
-
-# PHPStorm
-.idea/
-.nameencodings
-.xmlmisc
-.xmlmodules
-.xmlprojectCodeStyle
-.xmlvcs.xml
-*.imlworkspace
-.xml
-
-# Sublime Text 2
-*.sublime-*
-
-# Textmate
-*.tmproj
-
-# ATK
-# skel temp files
-skel/atktmp/
+/vendor
+/node_modules
+composer.lock
Oops, something went wrong.

0 comments on commit 32a798c

Please sign in to comment.