summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2013-04-11 22:54:04 -0700
committerAndrew Arnott <andrewarnott@gmail.com>2013-04-11 22:54:04 -0700
commit3348abf994f2abe5526454bef1a2194bba554e5c (patch)
treeb77f4022f1bcf8a3f3a15b0855363bfc45b6e22a /src
parent9e33a9e89ba1973cb3bf923e1303105047094d9c (diff)
parent2feb70bbb0c47a95a6edf68c492b4c2c7d2266bb (diff)
downloadDotNetOpenAuth-3348abf994f2abe5526454bef1a2194bba554e5c.zip
DotNetOpenAuth-3348abf994f2abe5526454bef1a2194bba554e5c.tar.gz
DotNetOpenAuth-3348abf994f2abe5526454bef1a2194bba554e5c.tar.bz2
Merge branch 'v4.2' into v4.3
Diffstat (limited to 'src')
-rw-r--r--src/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/.gitignore b/src/.gitignore
index 420748a..a5031e1 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -9,3 +9,4 @@ _ReSharper.*
bin
obj
Bin
+packages \ No newline at end of file