Merge remote-tracking branch 'origin/master' into remote2

2017-09-06 20:12:49 +03:00
parent 646db5b914 b013caee69
commit 151bfb9cec
147 changed files with 1763 additions and 847 deletions
@@ -108,7 +108,7 @@ AppPackages/
 # NCrunch
 _NCrunch_*/
 *.ncrunchsolution.user
-nCrunchTemp_*/
+nCrunchTemp_*

 # Others
 sql/
@@ -159,6 +159,12 @@ $RECYCLE.BIN/
 *.userprefs
 *.nugetreferenceswitcher

+
+#################
+## Rider
+#################
+.idea
+
 #################
 ## Cake
 #################