diff options
author | Alessandro Cosentino <cosenal@gmail.com> | 2012-08-17 23:01:13 -0400 |
---|---|---|
committer | Alessandro Cosentino <cosenal@gmail.com> | 2012-08-17 23:01:13 -0400 |
commit | 45e7d2dfd727315d3a102aa9ba97c6c2eebec68e (patch) | |
tree | 7d397f26b76012666f5f0ff9ff3f74440d7472ca /appinfo | |
parent | 30fcd3949cd8bc74be9debd6fe8c53015dc06798 (diff) | |
parent | 91dff3767b957a59cd150be4c8126452964c5826 (diff) |
fix conflicts
Diffstat (limited to 'appinfo')
-rw-r--r-- | appinfo/version | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/appinfo/version b/appinfo/version index 468c41f93..7495c0a15 100644 --- a/appinfo/version +++ b/appinfo/version @@ -1 +1,2 @@ -7.2.1
\ No newline at end of file +7.2.2 + |